From c7ead43a2984bb1540f7993e0c725f279674adfd Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sun, 7 May 2023 10:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=97=B4=E9=9A=94=E8=BE=93=E5=85=A5=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=20#285?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forwarder/fragment/SettingsFragment.kt    |  68 ++-----
 app/src/main/res/layout/fragment_settings.xml | 170 ++++++++++--------
 2 files changed, 105 insertions(+), 133 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt
index 7565a4b7..d9a678d1 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt
@@ -145,7 +145,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding?>(), View.OnClickL
         )
 
         //接口请求失败重试时间间隔
-        editRetryDelayTime(binding!!.etRetryTimes, binding!!.etDelayTime, binding!!.etTimeout)
+        editRetryDelayTime(binding!!.xsbRetryTimes, binding!!.xsbDelayTime, binding!!.xsbTimeout)
 
         //设备备注
         editAddExtraDeviceMark(binding!!.etExtraDeviceMark)
@@ -793,60 +793,20 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding?>(), View.OnClickL
 
     //接口请求失败重试时间间隔
     private fun editRetryDelayTime(
-        etRetryTimes: EditText, etDelayTime: EditText, etTimeout: EditText
+        xsbRetryTimes: XSeekBar, xsbDelayTime: XSeekBar, xsbTimeout: XSeekBar
     ) {
-        etRetryTimes.setText(java.lang.String.valueOf(SettingUtils.requestRetryTimes))
-        etRetryTimes.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
-            override fun afterTextChanged(s: Editable) {
-                val retryTimes = etRetryTimes.text.toString().trim()
-                if (retryTimes.isNotEmpty()) {
-                    SettingUtils.requestRetryTimes = retryTimes.toInt()
-                } else {
-                    etRetryTimes.setText("0")
-                    SettingUtils.requestRetryTimes = 0
-                }
-            }
-        })
-        etDelayTime.setText(java.lang.String.valueOf(SettingUtils.requestDelayTime))
-        etDelayTime.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
-            override fun afterTextChanged(s: Editable) {
-                val delayTime = etDelayTime.text.toString().trim()
-                if (delayTime.isNotEmpty()) {
-                    SettingUtils.requestDelayTime = delayTime.toInt()
-                    if (SettingUtils.requestDelayTime < 1) {
-                        etDelayTime.setText("1")
-                        XToastUtils.error(R.string.invalid_delay_time)
-                    }
-                } else {
-                    XToastUtils.warning(R.string.invalid_delay_time)
-                    etDelayTime.setText("1")
-                    SettingUtils.requestDelayTime = 1
-                }
-            }
-        })
-        etTimeout.setText(java.lang.String.valueOf(SettingUtils.requestTimeout))
-        etTimeout.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
-            override fun afterTextChanged(s: Editable) {
-                val timeout = etTimeout.text.toString().trim()
-                if (timeout.isNotEmpty()) {
-                    SettingUtils.requestTimeout = timeout.toInt()
-                    if (SettingUtils.requestTimeout < 1) {
-                        etTimeout.setText("1")
-                        XToastUtils.error(R.string.invalid_timeout)
-                    }
-                } else {
-                    XToastUtils.warning(R.string.invalid_timeout)
-                    etTimeout.setText("1")
-                    SettingUtils.requestTimeout = 1
-                }
-            }
-        })
+        xsbRetryTimes.setDefaultValue(SettingUtils.requestRetryTimes)
+        xsbRetryTimes.setOnSeekBarListener { _: XSeekBar?, newValue: Int ->
+            SettingUtils.requestRetryTimes = newValue
+        }
+        xsbDelayTime.setDefaultValue(SettingUtils.requestDelayTime)
+        xsbDelayTime.setOnSeekBarListener { _: XSeekBar?, newValue: Int ->
+            SettingUtils.requestDelayTime = newValue
+        }
+        xsbTimeout.setDefaultValue(SettingUtils.requestTimeout)
+        xsbTimeout.setOnSeekBarListener { _: XSeekBar?, newValue: Int ->
+            SettingUtils.requestTimeout = newValue
+        }
     }
 
     //设置设备名称
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index da96f8d7..83d30657 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1145,6 +1145,7 @@
                 style="@style/settingBarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:baselineAligned="false"
                 android:paddingEnd="15dp"
                 tools:ignore="RtlSymmetry">
 
@@ -1167,95 +1168,106 @@
                         tools:ignore="SmallSp" />
                 </LinearLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="@string/retry"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <EditText
-                    android:id="@+id/et_retry_times"
+                <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:autofillHints=""
-                    android:digits="0123456789"
-                    android:inputType="number"
-                    android:maxLength="2"
-                    android:maxLines="1"
-                    android:text="@string/_0"
-                    android:textAlignment="center"
-                    android:textSize="12sp"
-                    tools:ignore="LabelFor" />
+                    android:orientation="vertical">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/times"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="@string/interval"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:text="@string/retry"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
 
-                <EditText
-                    android:id="@+id/et_delay_time"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:autofillHints=""
-                    android:digits="0123456789"
-                    android:inputType="number"
-                    android:maxLength="2"
-                    android:maxLines="1"
-                    android:text="@string/_1"
-                    android:textAlignment="center"
-                    android:textSize="12sp"
-                    tools:ignore="LabelFor" />
+                        <com.xuexiang.xui.widget.picker.XSeekBar
+                            android:id="@+id/xsb_retry_times"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:layout_weight="1"
+                            app:xsb_max="30"
+                            app:xsb_min="0" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/seconds"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:text="@string/times"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
+                    </LinearLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="@string/timeout"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
 
-                <EditText
-                    android:id="@+id/et_timeout"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:autofillHints=""
-                    android:digits="0123456789"
-                    android:inputType="number"
-                    android:maxLength="2"
-                    android:maxLines="1"
-                    android:text="@string/_10"
-                    android:textAlignment="center"
-                    android:textSize="12sp"
-                    tools:ignore="LabelFor" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:text="@string/interval"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/seconds"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
+                        <com.xuexiang.xui.widget.picker.XSeekBar
+                            android:id="@+id/xsb_delay_time"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:layout_weight="1"
+                            app:xsb_max="99"
+                            app:xsb_min="1" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:text="@string/seconds"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:text="@string/timeout"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
+
+                        <com.xuexiang.xui.widget.picker.XSeekBar
+                            android:id="@+id/xsb_timeout"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:layout_weight="1"
+                            app:xsb_max="99"
+                            app:xsb_min="1" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:text="@string/seconds"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                </LinearLayout>
 
             </LinearLayout>