diff --git a/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java b/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java index caa5df1..f5eba78 100644 --- a/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java +++ b/app/src/main/java/com/zcshou/gogogo/FragmentSettings.java @@ -33,22 +33,21 @@ public class FragmentSettings extends PreferenceFragmentCompat { ListPreference pfJoystick = findPreference("setting_joystick_type"); if (pfJoystick != null) { // 使用自定义 SummaryProvider - pfJoystick.setSummaryProvider((Preference.SummaryProvider) preference -> "当前类型: " + Objects.requireNonNull(preference.getEntry())); + pfJoystick.setSummaryProvider((Preference.SummaryProvider) preference -> getResources().getString(R.string.setting_current_value) + Objects.requireNonNull(preference.getEntry())); pfJoystick.setOnPreferenceChangeListener((preference, newValue) -> newValue.toString().trim().length() != 0); } EditTextPreference pfWalk = findPreference("setting_walk"); if (pfWalk != null) { // 使用自定义 SummaryProvider - pfWalk.setSummaryProvider((Preference.SummaryProvider) preference -> "当前值: " + preference.getText()); + pfWalk.setSummaryProvider((Preference.SummaryProvider) preference -> getResources().getString(R.string.setting_current_value) + preference.getText()); pfWalk.setOnBindEditTextListener(editText -> { editText.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL | InputType.TYPE_CLASS_NUMBER); Selection.setSelection(editText.getText(), editText.length()); }); pfWalk.setOnPreferenceChangeListener((preference, newValue) -> { - if (newValue.toString().trim().length() == 0) - { - GoUtils.DisplayToast(this.getContext(),"输入无效"); + if (newValue.toString().trim().length() == 0) { + GoUtils.DisplayToast(this.getContext(),getResources().getString(R.string.app_error_input)); return false; } return true; @@ -57,15 +56,14 @@ public class FragmentSettings extends PreferenceFragmentCompat { EditTextPreference pfRun = findPreference("setting_run"); if (pfRun != null) { - pfRun.setSummaryProvider((Preference.SummaryProvider) preference -> "当前值: " + preference.getText()); + pfRun.setSummaryProvider((Preference.SummaryProvider) preference -> getResources().getString(R.string.setting_current_value) + preference.getText()); pfRun.setOnBindEditTextListener(editText -> { editText.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL | InputType.TYPE_CLASS_NUMBER); Selection.setSelection(editText.getText(), editText.length()); }); pfRun.setOnPreferenceChangeListener((preference, newValue) -> { - if (newValue.toString().trim().length() == 0) - { - GoUtils.DisplayToast(this.getContext(),"输入无效"); + if (newValue.toString().trim().length() == 0) { + GoUtils.DisplayToast(this.getContext(),getResources().getString(R.string.app_error_input)); return false; } return true; @@ -73,15 +71,14 @@ public class FragmentSettings extends PreferenceFragmentCompat { } EditTextPreference pfBike = findPreference("setting_bike"); if (pfBike != null) { - pfBike.setSummaryProvider((Preference.SummaryProvider) preference -> "当前值: " + preference.getText()); + pfBike.setSummaryProvider((Preference.SummaryProvider) preference -> getResources().getString(R.string.setting_current_value) + preference.getText()); pfBike.setOnBindEditTextListener(editText -> { editText.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL | InputType.TYPE_CLASS_NUMBER); Selection.setSelection(editText.getText(), editText.length()); }); pfBike.setOnPreferenceChangeListener((preference, newValue) -> { - if (newValue.toString().trim().length() == 0) - { - GoUtils.DisplayToast(this.getContext(),"输入无效"); + if (newValue.toString().trim().length() == 0) { + GoUtils.DisplayToast(this.getContext(),getResources().getString(R.string.app_error_input)); return false; } return true; @@ -109,15 +106,14 @@ public class FragmentSettings extends PreferenceFragmentCompat { EditTextPreference pfPosHisValid = findPreference("setting_pos_history"); if (pfPosHisValid != null) { // 使用自定义 SummaryProvider - pfPosHisValid.setSummaryProvider((Preference.SummaryProvider) preference -> "当前值: " + preference.getText()); + pfPosHisValid.setSummaryProvider((Preference.SummaryProvider) preference -> getResources().getString(R.string.setting_current_value) + preference.getText()); pfPosHisValid.setOnBindEditTextListener(editText -> { editText.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL | InputType.TYPE_CLASS_NUMBER); Selection.setSelection(editText.getText(), editText.length()); }); pfPosHisValid.setOnPreferenceChangeListener((preference, newValue) -> { - if (newValue.toString().trim().length() == 0) - { - GoUtils.DisplayToast(this.getContext(),"输入无效"); + if (newValue.toString().trim().length() == 0) { + GoUtils.DisplayToast(this.getContext(),getResources().getString(R.string.app_error_input)); return false; } return true; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d6dc573..706f7e3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,14 +22,35 @@ 定位不可用,请检查 GPS 是否开启 网络不可用,请检查网络连接 权限不足,请授予相关权限 + 输入有误,请检查输入是否合法 + + + 进入应用 + + + 移动 + 当前值: + 摇杆类型 + 重启摇杆后生效 + 步行速度(米/秒) + 1.2 + 跑步速度(米/秒) + 3.6 + 驾驶速度(米/秒) + 10.0 + 记录 + 关闭日志 + 历史记录有效期(天) + 7 + 关于 + 版本号 + 开发者 + 系统 显示摇杆 隐藏摇杆 - - 进入应用 - 经度 纬度 @@ -63,25 +84,6 @@ 问题反馈 联系作者 - - 移动 - 摇杆类型 - 重启摇杆后生效 - 步行速度(米/秒) - 1.2 - 跑步速度(米/秒) - 3.6 - 驾驶速度(米/秒) - 10.0 - 记录 - 关闭日志 - 历史记录有效期(天) - 7 - 关于 - 版本号 - 开发者 - 系统 - 卫星图 普通图