From 8b5d626c4005361e29f1b31039a20d52e75a4d8f Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 13 Oct 2021 22:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E2=80=9C=E8=BD=AC=E5=8F=91=E6=97=B6=E9=99=84?=
=?UTF-8?q?=E5=8A=A0=E5=8D=A1=E6=A7=BD=E4=BF=A1=E6=81=AF=E2=80=9D=E5=92=8C?=
=?UTF-8?q?=E2=80=9C=E8=BD=AC=E5=8F=91=E6=97=B6=E9=99=84=E5=8A=A0=E8=AE=BE?=
=?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0=E2=80=9D=E5=BC=80=E5=85=B3=EF=BC=8C?=
=?UTF-8?q?=E8=8B=A5=E9=9C=80=E8=A6=81=E7=9B=B4=E6=8E=A5=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E2=80=9C=E8=BD=AC=E5=8F=91=E4=BF=A1=E6=81=AF=E6=A8=A1=E6=9D=BF?=
=?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../idormy/sms/forwarder/SettingActivity.java | 24 ++------
app/src/main/res/layout/activity_setting.xml | 58 ++-----------------
2 files changed, 8 insertions(+), 74 deletions(-)
diff --git a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java
index 65cd04b8..3db70129 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java
@@ -26,9 +26,6 @@ public class SettingActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_setting);
- @SuppressLint("UseSwitchCompatOrMaterialCode") Switch switch_add_extra = findViewById(R.id.switch_add_extra);
- switchAddExtra(switch_add_extra);
-
EditText et_add_extra_device_mark = findViewById(R.id.et_add_extra_device_mark);
editAddExtraDeviceMark(et_add_extra_device_mark);
@@ -62,16 +59,6 @@ public class SettingActivity extends AppCompatActivity {
editSmsTemplate(textSmsTemplate);
}
- //设置转发附加信息
- private void switchAddExtra(@SuppressLint("UseSwitchCompatOrMaterialCode") Switch switch_add_extra) {
- switch_add_extra.setChecked(SettingUtil.getSwitchAddExtra());
-
- switch_add_extra.setOnCheckedChangeListener((buttonView, isChecked) -> {
- SettingUtil.switchAddExtra(isChecked);
- Log.d(TAG, "onCheckedChanged:" + isChecked);
- });
- }
-
//设置转发来电
private void switchEnablePhone(@SuppressLint("UseSwitchCompatOrMaterialCode") Switch switch_enable_phone) {
switch_enable_phone.setChecked(SettingUtil.getSwitchEnablePhone());
@@ -82,7 +69,7 @@ public class SettingActivity extends AppCompatActivity {
});
}
- //设置转发附加信息deviceMark
+ //设置设备名称
private void editAddExtraDeviceMark(final EditText et_add_extra_device_mark) {
et_add_extra_device_mark.setText(SettingUtil.getAddExtraDeviceMark());
@@ -104,7 +91,7 @@ public class SettingActivity extends AppCompatActivity {
});
}
- //设置转发附加信息deviceMark
+ //设置SIM1备注
private void editAddExtraSim1(final EditText et_add_extra_sim1) {
et_add_extra_sim1.setText(SettingUtil.getAddExtraSim1());
@@ -126,7 +113,7 @@ public class SettingActivity extends AppCompatActivity {
});
}
- //设置转发附加信息deviceMark
+ //设置SIM2备注
private void editAddExtraSim2(final EditText et_add_extra_sim2) {
et_add_extra_sim2.setText(SettingUtil.getAddExtraSim2());
@@ -218,7 +205,7 @@ public class SettingActivity extends AppCompatActivity {
});
}
- //设置转发附加信息deviceMark
+ //设置转发信息模版
private void editSmsTemplate(final EditText textSmsTemplate) {
textSmsTemplate.setText(SettingUtil.getSmsTemplate());
@@ -268,9 +255,6 @@ public class SettingActivity extends AppCompatActivity {
//恢复初始化配置
public void initSetting(View view) {
- @SuppressLint("UseSwitchCompatOrMaterialCode") Switch switch_add_extra = findViewById(R.id.switch_add_extra);
- switch_add_extra.setChecked(false);
- switchAddExtra(switch_add_extra);
EditText et_add_extra_device_mark = findViewById(R.id.et_add_extra_device_mark);
et_add_extra_device_mark.setText("");
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 9e21e2c3..51ede3cb 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -271,61 +271,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+