From 066d410e889cb03b4250e77741fa4d377a749242 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Tue, 23 Nov 2021 16:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E7=A1=AE=E8=AE=A4=EF=BC=88=E9=98=B2=E6=AD=A2=E8=AF=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=89=EF=BC=8C=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8C=85=E6=8B=AC=EF=BC=9A=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E3=80=81=E5=88=A0=E9=99=A4=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=80=9A=E9=81=93=E3=80=81=E8=A7=84=E5=88=99=E3=80=81=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idormy/sms/forwarder/SettingActivity.java | 47 ++++++++++++------- app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values/strings.xml | 3 +- 3 files changed, 33 insertions(+), 18 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 7a0e57f0..96d27005 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SettingActivity.java @@ -4,8 +4,11 @@ import android.annotation.SuppressLint; import android.app.ActivityManager; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; +import android.database.sqlite.SQLiteDatabase; import android.os.Build; import android.os.Bundle; +import android.preference.PreferenceManager; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; @@ -17,9 +20,11 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import com.idormy.sms.forwarder.utils.CommonUtil; +import com.idormy.sms.forwarder.utils.DbHelper; import com.idormy.sms.forwarder.utils.KeepAliveUtils; import com.idormy.sms.forwarder.utils.SettingUtil; @@ -320,26 +325,34 @@ public class SettingActivity extends AppCompatActivity { //恢复初始化配置 public void initSetting(View view) { - EditText et_add_extra_device_mark = findViewById(R.id.et_add_extra_device_mark); - et_add_extra_device_mark.setText(""); - editAddExtraDeviceMark(et_add_extra_device_mark); - - EditText et_add_extra_sim1 = findViewById(R.id.et_add_extra_sim1); - et_add_extra_sim1.setText(""); - editAddExtraSim1(et_add_extra_sim1); - - EditText et_add_extra_sim2 = findViewById(R.id.et_add_extra_sim2); - et_add_extra_sim2.setText(""); - editAddExtraSim2(et_add_extra_sim2); + AlertDialog.Builder builder = new AlertDialog.Builder(SettingActivity.this); + builder.setTitle(R.string.init_setting); + builder.setMessage(R.string.init_setting_tips); + + //添加AlertDialog.Builder对象的setPositiveButton()方法 + builder.setPositiveButton(R.string.confirm, (dialog, which) -> { + //初始化配置 + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor editor = preferences.edit(); + editor.clear(); + editor.commit(); + + //初始化数据库 + DbHelper dbHelper = new DbHelper(this); + SQLiteDatabase db = dbHelper.getReadableDatabase(); + dbHelper.delCreateTable(db); + dbHelper.onCreate(db); + + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + }); - @SuppressLint("UseSwitchCompatOrMaterialCode") Switch switch_sms_template = findViewById(R.id.switch_sms_template); - switch_sms_template.setChecked(false); - switchSmsTemplate(switch_sms_template); + //添加AlertDialog.Builder对象的setNegativeButton()方法 + builder.setNegativeButton(R.string.cancel, (dialog, which) -> { - EditText textSmsTemplate = findViewById(R.id.text_sms_template); - textSmsTemplate.setText("{{来源号码}}\n{{短信内容}}\n{{卡槽信息}}\n{{接收时间}}\n{{设备名称}}"); - editSmsTemplate(textSmsTemplate); + }); + builder.create().show(); } //电池优化设置 diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 7b2fbc92..976b6829 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -179,6 +179,7 @@ Time Device Restore initial Setting + Are you sure you want to restore the initial configuration? \n\n[Warning] This operation will reset Settings, delete send channels, rules, logs! Battery Optimization Request Notify Permission Unknown Number diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 646423dd..eb5682f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -178,7 +178,8 @@ 卡槽信息 接收时间 设备名称 - 恢复默认配置 + 恢复初始配置 + 确定需要恢复初始配置吗？\n\n【警告】此操作将重置设置、删除发送通道、规则、日志！ 设置电池优化 请求通知权限 未知号码