优化:StepBar控件

This commit is contained in:
pppscn 2022-01-25 07:28:07 +08:00
parent b2adf63fdb
commit 18b1efaf93
3 changed files with 7 additions and 4 deletions

View File

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

View File

@ -426,7 +426,7 @@
android:padding="15dp">
<LinearLayout
android:layout_width="110dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">

View File

@ -168,7 +168,7 @@
<string name="device_name">Device name</string>
<string name="sim1_remark" tools:ignore="Typos">SIM1 Label</string>
<string name="sim2_remark" tools:ignore="Typos">SIM2 Label</string>
<string name="carrier_mobile" tools:ignore="Typos">Label of SIM,\neg. SIM1_AT&amp;T_88888888</string>
<string name="carrier_mobile" tools:ignore="Typos">Label of SIM,\neg. AT&amp;T_88888888</string>
<string name="low_power_alarm_threshold">Low power alarm</string>
<string name="low_power_alarm_threshold_tips">Value range: 0100.\nLeft blank or 0 is disabled</string>
<string name="retry_interval">Retry interval</string>