diff --git a/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java b/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java index c0bed148..61c58b51 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java +++ b/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java @@ -178,8 +178,11 @@ public class StepBar extends LinearLayout { boolean Step4 = LogUtil.countLog("2", null, null) > 0; //页面提示文本 - if (MyApplication.showHelpTip && current_step.equals("main") && txHelpTip != null) { - txHelpTip.setText(Step1 ? R.string.log_tips : R.string.setting_tips); + if (txHelpTip != null) { + txHelpTip.setVisibility(MyApplication.showHelpTip ? View.VISIBLE : View.GONE); + if (MyApplication.showHelpTip && current_step.equals("main")) { + txHelpTip.setText(Step1 ? R.string.log_tips : R.string.setting_tips); + } } if (Step1) txStep1.setBackground(mContext.getResources().getDrawable(R.drawable.step_circle_current)); diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 2362d78f..83777241 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -426,7 +426,7 @@ android:padding="15dp"> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 575d47d8..cf6e856b 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -168,7 +168,7 @@ Device name SIM1 Label SIM2 Label - Label of SIM,\neg. SIM1_AT&T_88888888 + Label of SIM,\neg. AT&T_88888888 Low power alarm Value range: 0–100.\nLeft blank or 0 is disabled Retry interval