diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
index b3a78e2..f9ecda6 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
@@ -3,9 +3,8 @@
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.ktd.R
@@ -74,7 +73,7 @@
                 }
             }
         }
-        getTasksByPage()
+        getTasksByPage(true)
 
         alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
     }
@@ -90,9 +89,8 @@
         when (msg.what) {
             2023070501 -> {
                 if (dataBeans.size == 0) {
-                    bv.emptyLayout.visibility = View.VISIBLE
+                    bv.taskLayout.visibility = View.GONE
                 } else {
-                    bv.emptyLayout.visibility = View.GONE
                     taskAdapter = TaskAdapter(requireContext(), dataBeans)
                     //绑定侧滑事件
                     swipeAction.attachToRecyclerView(bv.taskRecyclerView)
@@ -180,8 +178,7 @@
                         startTime = startDate
                         endTime = endDate
                         //条件查询
-                        page = 1
-                        getTasksByPage()
+                        getTasksByPage(true)
 
                         //显示
                         bv.selectedDateView.text = "$startDate ~ $endDate"
@@ -189,51 +186,32 @@
                 }).build().show()
         }
 
-        bv.taskNameView.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
+        bv.taskNameView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
+        bv.taskCodeView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
-
-            override fun afterTextChanged(s: Editable?) {
-//                if (taskNameViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
-
-        bv.taskCodeView.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?) {
-//                if (taskCodeViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
         bv.resetParamView.setOnClickListener {
             bv.selectedDateView.text = ""
             bv.taskNameView.setText("")
             bv.taskCodeView.setText("")
 
-            page = 1
             startTime = ""
             endTime = ""
 
             //显示所有
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.addTaskButton.setOnClickListener {
@@ -282,19 +260,21 @@
 
         bv.taskLayout.setOnRefreshListener {
             isRefresh = true
-            //刷新之后页码重置
-            page = 1
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.taskLayout.setOnLoadMoreListener {
             isLoadMore = true
-            page++
-            getTasksByPage()
+            getTasksByPage(false)
         }
     }
 
-    private fun getTasksByPage() {
+    private fun getTasksByPage(isRefresh: Boolean) {
+        if (isRefresh) {
+            page = 1
+        } else {
+            page++
+        }
         taskViewModel.getTasksByPage(
             startTime,
             endTime,

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
index b3a78e2..f9ecda6 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
@@ -3,9 +3,8 @@
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.ktd.R
@@ -74,7 +73,7 @@
                 }
             }
         }
-        getTasksByPage()
+        getTasksByPage(true)
 
         alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
     }
@@ -90,9 +89,8 @@
         when (msg.what) {
             2023070501 -> {
                 if (dataBeans.size == 0) {
-                    bv.emptyLayout.visibility = View.VISIBLE
+                    bv.taskLayout.visibility = View.GONE
                 } else {
-                    bv.emptyLayout.visibility = View.GONE
                     taskAdapter = TaskAdapter(requireContext(), dataBeans)
                     //绑定侧滑事件
                     swipeAction.attachToRecyclerView(bv.taskRecyclerView)
@@ -180,8 +178,7 @@
                         startTime = startDate
                         endTime = endDate
                         //条件查询
-                        page = 1
-                        getTasksByPage()
+                        getTasksByPage(true)
 
                         //显示
                         bv.selectedDateView.text = "$startDate ~ $endDate"
@@ -189,51 +186,32 @@
                 }).build().show()
         }
 
-        bv.taskNameView.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
+        bv.taskNameView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
+        bv.taskCodeView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
-
-            override fun afterTextChanged(s: Editable?) {
-//                if (taskNameViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
-
-        bv.taskCodeView.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?) {
-//                if (taskCodeViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
         bv.resetParamView.setOnClickListener {
             bv.selectedDateView.text = ""
             bv.taskNameView.setText("")
             bv.taskCodeView.setText("")
 
-            page = 1
             startTime = ""
             endTime = ""
 
             //显示所有
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.addTaskButton.setOnClickListener {
@@ -282,19 +260,21 @@
 
         bv.taskLayout.setOnRefreshListener {
             isRefresh = true
-            //刷新之后页码重置
-            page = 1
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.taskLayout.setOnLoadMoreListener {
             isLoadMore = true
-            page++
-            getTasksByPage()
+            getTasksByPage(false)
         }
     }
 
-    private fun getTasksByPage() {
+    private fun getTasksByPage(isRefresh: Boolean) {
+        if (isRefresh) {
+            page = 1
+        } else {
+            page++
+        }
         taskViewModel.getTasksByPage(
             startTime,
             endTime,
diff --git a/app/src/main/res/layout/fragment_alarm.xml b/app/src/main/res/layout/fragment_alarm.xml
index 929529f..c218ab3 100644
--- a/app/src/main/res/layout/fragment_alarm.xml
+++ b/app/src/main/res/layout/fragment_alarm.xml
@@ -72,7 +72,7 @@
             app:cardUseCompatPadding="true">
 
             <com.pengxh.kt.lite.widget.DeleteEditText
-                android:layout_width="200dp"
+                android:layout_width="@dimen/dp_180"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
index b3a78e2..f9ecda6 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
@@ -3,9 +3,8 @@
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.ktd.R
@@ -74,7 +73,7 @@
                 }
             }
         }
-        getTasksByPage()
+        getTasksByPage(true)
 
         alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
     }
@@ -90,9 +89,8 @@
         when (msg.what) {
             2023070501 -> {
                 if (dataBeans.size == 0) {
-                    bv.emptyLayout.visibility = View.VISIBLE
+                    bv.taskLayout.visibility = View.GONE
                 } else {
-                    bv.emptyLayout.visibility = View.GONE
                     taskAdapter = TaskAdapter(requireContext(), dataBeans)
                     //绑定侧滑事件
                     swipeAction.attachToRecyclerView(bv.taskRecyclerView)
@@ -180,8 +178,7 @@
                         startTime = startDate
                         endTime = endDate
                         //条件查询
-                        page = 1
-                        getTasksByPage()
+                        getTasksByPage(true)
 
                         //显示
                         bv.selectedDateView.text = "$startDate ~ $endDate"
@@ -189,51 +186,32 @@
                 }).build().show()
         }
 
-        bv.taskNameView.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
+        bv.taskNameView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
+        bv.taskCodeView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
-
-            override fun afterTextChanged(s: Editable?) {
-//                if (taskNameViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
-
-        bv.taskCodeView.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?) {
-//                if (taskCodeViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
         bv.resetParamView.setOnClickListener {
             bv.selectedDateView.text = ""
             bv.taskNameView.setText("")
             bv.taskCodeView.setText("")
 
-            page = 1
             startTime = ""
             endTime = ""
 
             //显示所有
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.addTaskButton.setOnClickListener {
@@ -282,19 +260,21 @@
 
         bv.taskLayout.setOnRefreshListener {
             isRefresh = true
-            //刷新之后页码重置
-            page = 1
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.taskLayout.setOnLoadMoreListener {
             isLoadMore = true
-            page++
-            getTasksByPage()
+            getTasksByPage(false)
         }
     }
 
-    private fun getTasksByPage() {
+    private fun getTasksByPage(isRefresh: Boolean) {
+        if (isRefresh) {
+            page = 1
+        } else {
+            page++
+        }
         taskViewModel.getTasksByPage(
             startTime,
             endTime,
diff --git a/app/src/main/res/layout/fragment_alarm.xml b/app/src/main/res/layout/fragment_alarm.xml
index 929529f..c218ab3 100644
--- a/app/src/main/res/layout/fragment_alarm.xml
+++ b/app/src/main/res/layout/fragment_alarm.xml
@@ -72,7 +72,7 @@
             app:cardUseCompatPadding="true">
 
             <com.pengxh.kt.lite.widget.DeleteEditText
-                android:layout_width="200dp"
+                android:layout_width="@dimen/dp_180"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml
index 8ce604f..524886d 100644
--- a/app/src/main/res/layout/fragment_task.xml
+++ b/app/src/main/res/layout/fragment_task.xml
@@ -55,12 +55,14 @@
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:id="@+id/taskNameView"
-                android:layout_width="200dp"
+                android:layout_width="@dimen/dp_180"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
                 android:background="@null"
-                android:hint="请输入巡检任务名称" />
+                android:hint="请输入巡检任务名称"
+                android:imeOptions="actionSearch"
+                android:singleLine="true" />
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -73,12 +75,14 @@
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:id="@+id/taskCodeView"
-                android:layout_width="200dp"
+                android:layout_width="@dimen/dp_180"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
                 android:background="@null"
-                android:hint="请输入巡检任务编号" />
+                android:hint="请输入巡检任务编号"
+                android:imeOptions="actionSearch"
+                android:singleLine="true" />
         </androidx.cardview.widget.CardView>
 
         <TextView
@@ -139,10 +143,6 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <include
-                android:id="@+id/emptyLayout"
-                layout="@layout/include_empty_view" />
-
             <com.scwang.smartrefresh.layout.SmartRefreshLayout
                 android:id="@+id/taskLayout"
                 android:layout_width="match_parent"
@@ -163,6 +163,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+            <include layout="@layout/include_empty_view" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
index b3a78e2..f9ecda6 100644
--- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
+++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt
@@ -3,9 +3,8 @@
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.ktd.R
@@ -74,7 +73,7 @@
                 }
             }
         }
-        getTasksByPage()
+        getTasksByPage(true)
 
         alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java]
     }
@@ -90,9 +89,8 @@
         when (msg.what) {
             2023070501 -> {
                 if (dataBeans.size == 0) {
-                    bv.emptyLayout.visibility = View.VISIBLE
+                    bv.taskLayout.visibility = View.GONE
                 } else {
-                    bv.emptyLayout.visibility = View.GONE
                     taskAdapter = TaskAdapter(requireContext(), dataBeans)
                     //绑定侧滑事件
                     swipeAction.attachToRecyclerView(bv.taskRecyclerView)
@@ -180,8 +178,7 @@
                         startTime = startDate
                         endTime = endDate
                         //条件查询
-                        page = 1
-                        getTasksByPage()
+                        getTasksByPage(true)
 
                         //显示
                         bv.selectedDateView.text = "$startDate ~ $endDate"
@@ -189,51 +186,32 @@
                 }).build().show()
         }
 
-        bv.taskNameView.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
+        bv.taskNameView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
+        bv.taskCodeView.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                getTasksByPage(true)
             }
-
-            override fun afterTextChanged(s: Editable?) {
-//                if (taskNameViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
-
-        bv.taskCodeView.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?) {
-//                if (taskCodeViewFocused) {
-//                    page = 1
-//                    getTasksByPage()
-//                }
-            }
-        })
+            //返回true，保留软键盘。false，隐藏软键盘
+            false
+        }
 
         bv.resetParamView.setOnClickListener {
             bv.selectedDateView.text = ""
             bv.taskNameView.setText("")
             bv.taskCodeView.setText("")
 
-            page = 1
             startTime = ""
             endTime = ""
 
             //显示所有
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.addTaskButton.setOnClickListener {
@@ -282,19 +260,21 @@
 
         bv.taskLayout.setOnRefreshListener {
             isRefresh = true
-            //刷新之后页码重置
-            page = 1
-            getTasksByPage()
+            getTasksByPage(true)
         }
 
         bv.taskLayout.setOnLoadMoreListener {
             isLoadMore = true
-            page++
-            getTasksByPage()
+            getTasksByPage(false)
         }
     }
 
-    private fun getTasksByPage() {
+    private fun getTasksByPage(isRefresh: Boolean) {
+        if (isRefresh) {
+            page = 1
+        } else {
+            page++
+        }
         taskViewModel.getTasksByPage(
             startTime,
             endTime,
diff --git a/app/src/main/res/layout/fragment_alarm.xml b/app/src/main/res/layout/fragment_alarm.xml
index 929529f..c218ab3 100644
--- a/app/src/main/res/layout/fragment_alarm.xml
+++ b/app/src/main/res/layout/fragment_alarm.xml
@@ -72,7 +72,7 @@
             app:cardUseCompatPadding="true">
 
             <com.pengxh.kt.lite.widget.DeleteEditText
-                android:layout_width="200dp"
+                android:layout_width="@dimen/dp_180"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml
index 8ce604f..524886d 100644
--- a/app/src/main/res/layout/fragment_task.xml
+++ b/app/src/main/res/layout/fragment_task.xml
@@ -55,12 +55,14 @@
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:id="@+id/taskNameView"
-                android:layout_width="200dp"
+                android:layout_width="@dimen/dp_180"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
                 android:background="@null"
-                android:hint="请输入巡检任务名称" />
+                android:hint="请输入巡检任务名称"
+                android:imeOptions="actionSearch"
+                android:singleLine="true" />
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -73,12 +75,14 @@
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:id="@+id/taskCodeView"
-                android:layout_width="200dp"
+                android:layout_width="@dimen/dp_180"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="@dimen/dp_10"
                 android:layout_marginVertical="@dimen/dp_7"
                 android:background="@null"
-                android:hint="请输入巡检任务编号" />
+                android:hint="请输入巡检任务编号"
+                android:imeOptions="actionSearch"
+                android:singleLine="true" />
         </androidx.cardview.widget.CardView>
 
         <TextView
@@ -139,10 +143,6 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <include
-                android:id="@+id/emptyLayout"
-                layout="@layout/include_empty_view" />
-
             <com.scwang.smartrefresh.layout.SmartRefreshLayout
                 android:id="@+id/taskLayout"
                 android:layout_width="match_parent"
@@ -163,6 +163,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+            <include layout="@layout/include_empty_view" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 289128c..3e79bf8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -35,6 +35,7 @@
     <dimen name="dp_100">100dp</dimen>
     <dimen name="dp_125">125dp</dimen>
     <dimen name="dp_150">150dp</dimen>
+    <dimen name="dp_180">180dp</dimen>
     <dimen name="dp_200">200dp</dimen>
     <dimen name="dp_275">275dp</dimen>