From a222b8b27a3f237f1ef683838965d8856222543f Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 2 Feb 2022 19:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=BE=AE=E8=B0=83=EF=BC=88?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=8D=A2=E8=A1=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_setting.xml | 13 +++++++------
 app/src/main/res/values/strings.xml          | 14 +++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index a75679f8..7e9811ec 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -132,7 +132,8 @@
                             android:id="@+id/cbCallType3"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="-6dp"
+                            android:layout_marginStart="-15dp"
+                            android:padding="0dp"
                             android:scaleX="0.7"
                             android:scaleY="0.7"
                             android:text="@string/missed_call" />
@@ -141,7 +142,7 @@
                             android:id="@+id/cbCallType1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="-16dp"
+                            android:layout_marginStart="-25dp"
                             android:scaleX="0.7"
                             android:scaleY="0.7"
                             android:text="@string/received_call" />
@@ -150,7 +151,7 @@
                             android:id="@+id/cbCallType2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="-16dp"
+                            android:layout_marginStart="-25dp"
                             android:scaleX="0.7"
                             android:scaleY="0.7"
                             android:text="@string/local_outgoing_call" />
@@ -447,7 +448,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
+                    android:layout_marginStart="10dp"
                     android:text="@string/below"
                     android:textSize="12sp"
                     android:textStyle="bold" />
@@ -477,7 +478,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
+                    android:layout_marginStart="10dp"
                     android:text="@string/above"
                     android:textSize="12sp"
                     android:textStyle="bold" />
@@ -678,7 +679,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
+                    android:layout_marginStart="10dp"
                     android:text="@string/retry"
                     android:textStyle="bold" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c58f4ce..ecaaed9f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,16 +169,16 @@
     <string name="sim1_remark" tools:ignore="Typos">SIM1备注</string>
     <string name="sim2_remark" tools:ignore="Typos">SIM2备注</string>
     <string name="carrier_mobile">运营商_手机号</string>
-    <string name="low_power_alarm_threshold">电量预警阈值(%)</string>
-    <string name="low_power_alarm_threshold_tips">取值范围：0–99，0禁用</string>
+    <string name="low_power_alarm_threshold">电量预警(%)</string>
+    <string name="low_power_alarm_threshold_tips">取值：0–99，0禁用</string>
     <string name="retry_interval">请求接口失败重试</string>
     <string name="retry_interval_tips">次数=0时禁用，间隔逐次递增</string>
     <string name="forward_sms">转发短信广播</string>
-    <string name="forward_sms_tips">请先授予读取短信、通知类短信、发送短信等权限，关闭验证码保护</string>
+    <string name="forward_sms_tips">请授予读取短信、通知类短信、发送短信等权限，关闭验证码保护</string>
     <string name="forward_missed_calls">转发通话记录</string>
-    <string name="forward_missed_calls_tips">请先授予读取通话记录、联系人等权限，并选择转发类型，再开启</string>
+    <string name="forward_missed_calls_tips">请授予读取通话记录、联系人等权限，并选择转发类型，再开启</string>
     <string name="forward_app_notify">转发应用通知</string>
-    <string name="forward_app_notify_tips">请先授予通知使用权，再开启；开启“自动消除”可避免多条通知堆叠</string>
+    <string name="forward_app_notify_tips">请授予通知使用权再开启；开启“自动消除”可避免多条通知堆叠</string>
     <string name="cancel_app_notify">自动消除通知</string>
     <string name="enable_custom_templates">启用自定义模版</string>
     <string name="enable_custom_templates_tips">优先级：转发规则的自定义模板 > 全局自定义模版 > 默认</string>
@@ -322,9 +322,9 @@
     <string name="battery_monitor">电池监控</string>
     <string name="battery_monitor_tips">【注意】需要手动创建APP转发规则，包名：88888888</string>
     <string name="keep_alive">保活措施</string>
-    <string name="keep_alive_tips">建议开启每一项授权或设置，不要禁用通知栏，避免APP服务被杀</string>
+    <string name="keep_alive_tips">建议开启每一项授权或设置，不要禁用通知栏，避免APP被杀</string>
     <string name="custom_settings">个性设置</string>
-    <string name="custom_settings_tips">如果自动获取失败，请手动填写备注信息；清空后将再次自动获取！</string>
+    <string name="custom_settings_tips">如果自动获取失败，请手动填写备注 或 清空后再次自动获取</string>
     <string name="times">次</string>
     <string name="interval">间隔</string>
     <string name="seconds">秒</string>