diff --git a/app/build.gradle b/app/build.gradle
index bf82a4c..87eac08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@
         applicationId "com.casic.detector"
         minSdkVersion 22
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0.0"
+        versionCode 1001
+        versionName "1.0.0.1"
 
         ndk {
             moduleName "serial_port"
@@ -60,7 +60,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "COM_TCY" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
+            outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 

diff --git a/app/build.gradle b/app/build.gradle
index bf82a4c..87eac08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@
         applicationId "com.casic.detector"
         minSdkVersion 22
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0.0"
+        versionCode 1001
+        versionName "1.0.0.1"
 
         ndk {
             moduleName "serial_port"
@@ -60,7 +60,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "COM_TCY" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
+            outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
index 497f4bd..1c7d95b 100644
--- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
@@ -29,7 +29,7 @@
         return labelBeanDao.loadAll()
     }
 
-    fun loadLabelByCondition(selectedItem: String, value: String): MutableList<LabelBean> {
+    fun loadLabelByCondition(selectedItem: String, value: String?): MutableList<LabelBean> {
         val property = when (selectedItem) {
             LocaleConstant.SPINNER_ARRAY[0] -> LabelBeanDao.Properties.IdentifierId
             LocaleConstant.SPINNER_ARRAY[1] -> LabelBeanDao.Properties.Area
@@ -40,7 +40,11 @@
             LocaleConstant.SPINNER_ARRAY[6] -> LabelBeanDao.Properties.InstallTime
             else -> LabelBeanDao.Properties.Remark
         }
-        return labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        return if (value == null) {
+            labelBeanDao.queryBuilder().where(property.isNotNull).list()
+        } else {
+            labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        }
     }
 
     fun queryLabelById(identifierId: String): List<LabelBean> {

diff --git a/app/build.gradle b/app/build.gradle
index bf82a4c..87eac08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@
         applicationId "com.casic.detector"
         minSdkVersion 22
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0.0"
+        versionCode 1001
+        versionName "1.0.0.1"
 
         ndk {
             moduleName "serial_port"
@@ -60,7 +60,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "COM_TCY" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
+            outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
index 497f4bd..1c7d95b 100644
--- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
@@ -29,7 +29,7 @@
         return labelBeanDao.loadAll()
     }
 
-    fun loadLabelByCondition(selectedItem: String, value: String): MutableList<LabelBean> {
+    fun loadLabelByCondition(selectedItem: String, value: String?): MutableList<LabelBean> {
         val property = when (selectedItem) {
             LocaleConstant.SPINNER_ARRAY[0] -> LabelBeanDao.Properties.IdentifierId
             LocaleConstant.SPINNER_ARRAY[1] -> LabelBeanDao.Properties.Area
@@ -40,7 +40,11 @@
             LocaleConstant.SPINNER_ARRAY[6] -> LabelBeanDao.Properties.InstallTime
             else -> LabelBeanDao.Properties.Remark
         }
-        return labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        return if (value == null) {
+            labelBeanDao.queryBuilder().where(property.isNotNull).list()
+        } else {
+            labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        }
     }
 
     fun queryLabelById(identifierId: String): List<LabelBean> {
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 570dbc5..00e58d0 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -210,7 +210,6 @@
                 .setContext(context)
                 .setTitle("查看标识器")
                 .setSpinnerArray(LocaleConstant.SPINNER_ARRAY)
-                .setHintMessage("请输入查询条件")
                 .setNegativeButton("取消")
                 .setPositiveButton("确定")
                 .setOnDialogButtonClickListener(object :

diff --git a/app/build.gradle b/app/build.gradle
index bf82a4c..87eac08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@
         applicationId "com.casic.detector"
         minSdkVersion 22
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0.0"
+        versionCode 1001
+        versionName "1.0.0.1"
 
         ndk {
             moduleName "serial_port"
@@ -60,7 +60,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "COM_TCY" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
+            outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
index 497f4bd..1c7d95b 100644
--- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
@@ -29,7 +29,7 @@
         return labelBeanDao.loadAll()
     }
 
-    fun loadLabelByCondition(selectedItem: String, value: String): MutableList<LabelBean> {
+    fun loadLabelByCondition(selectedItem: String, value: String?): MutableList<LabelBean> {
         val property = when (selectedItem) {
             LocaleConstant.SPINNER_ARRAY[0] -> LabelBeanDao.Properties.IdentifierId
             LocaleConstant.SPINNER_ARRAY[1] -> LabelBeanDao.Properties.Area
@@ -40,7 +40,11 @@
             LocaleConstant.SPINNER_ARRAY[6] -> LabelBeanDao.Properties.InstallTime
             else -> LabelBeanDao.Properties.Remark
         }
-        return labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        return if (value == null) {
+            labelBeanDao.queryBuilder().where(property.isNotNull).list()
+        } else {
+            labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        }
     }
 
     fun queryLabelById(identifierId: String): List<LabelBean> {
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 570dbc5..00e58d0 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -210,7 +210,6 @@
                 .setContext(context)
                 .setTitle("查看标识器")
                 .setSpinnerArray(LocaleConstant.SPINNER_ARRAY)
-                .setHintMessage("请输入查询条件")
                 .setNegativeButton("取消")
                 .setPositiveButton("确定")
                 .setOnDialogButtonClickListener(object :
diff --git a/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt b/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
index f453bc1..b661064 100644
--- a/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
+++ b/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
@@ -5,10 +5,15 @@
 import android.os.Bundle
 import android.view.View
 import android.widget.*
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView
 import com.casic.detector.R
+import com.casic.detector.utils.DataBaseManager
 import com.pengxh.kt.lite.extensions.initDialogLayoutParams
-import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.widget.DeleteEditText
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
 
 class QueryMarkerDialog private constructor(builder: Builder) : Dialog(
     builder.context, R.style.UserDefinedDialogStyle
@@ -16,7 +21,6 @@
     private val ctx = builder.context
     private val title = builder.title
     private val spinnerArray = builder.spinnerArray
-    private val hint = builder.hint
     private val positiveBtn = builder.positiveBtn
     private val negativeBtn = builder.negativeBtn
     private val listener = builder.listener
@@ -25,7 +29,6 @@
         lateinit var context: Context
         lateinit var title: String
         lateinit var spinnerArray: Array<String>
-        lateinit var hint: String
         lateinit var positiveBtn: String
         lateinit var negativeBtn: String
         lateinit var listener: OnDialogButtonClickListener
@@ -45,11 +48,6 @@
             return this
         }
 
-        fun setHintMessage(hint: String): Builder {
-            this.hint = hint
-            return this
-        }
-
         fun setPositiveButton(name: String): Builder {
             positiveBtn = name
             return this
@@ -83,7 +81,7 @@
     private fun initView() {
         val dialogTitleView: TextView = findViewById(R.id.dialogTitleView)
         val dialogSpinnerView: Spinner = findViewById(R.id.dialogSpinnerView)
-        val dialogInputView: DeleteEditText = findViewById(R.id.dialogInputView)
+        val dialogInputView: AppCompatAutoCompleteTextView = findViewById(R.id.dialogInputView)
         val dialogCancelButton = findViewById<Button>(R.id.dialogCancelButton)
         val dialogConfirmButton = findViewById<Button>(R.id.dialogConfirmButton)
         if (title.isNotBlank()) {
@@ -102,6 +100,33 @@
                     adapterView: AdapterView<*>?, view: View?, position: Int, id: Long
                 ) {
                     selectedItem = spinnerArray[position]
+                    //查库
+                    val autoCompleteData = HashSet<String>()
+                    CoroutineScope(Dispatchers.Main).launch {
+                        val labelBeans = withContext(Dispatchers.IO) {
+                            DataBaseManager.get.loadLabelByCondition(selectedItem, null)
+                        }
+                        for (labelBean in labelBeans) {
+                            when (position) {
+                                0 -> autoCompleteData.add(labelBean.identifierId)
+                                1 -> autoCompleteData.add(labelBean.area)
+                                2 -> autoCompleteData.add(labelBean.line)
+                                3 -> autoCompleteData.add(labelBean.road)
+                                4 -> autoCompleteData.add(labelBean.owner)
+                                5 -> autoCompleteData.add(labelBean.person)
+                                6 -> autoCompleteData.add(labelBean.installTime)
+                                else -> autoCompleteData.add(labelBean.remark)
+                            }
+                        }
+
+                        //AppCompatAutoCompleteTextView逻辑
+                        val autoCompleteAdapter = ArrayAdapter(
+                            ctx,
+                            android.R.layout.simple_dropdown_item_1line,
+                            autoCompleteData.toArray()
+                        )
+                        dialogInputView.setAdapter(autoCompleteAdapter)
+                    }
                 }
 
                 override fun onNothingSelected(p0: AdapterView<*>?) {
@@ -110,9 +135,6 @@
             }
         }
 
-        if (hint.isNotBlank()) {
-            dialogInputView.hint = hint
-        }
         if (negativeBtn.isNotBlank()) {
             dialogCancelButton.text = negativeBtn
         }
@@ -123,15 +145,10 @@
         if (positiveBtn.isNotBlank()) {
             dialogConfirmButton.text = positiveBtn
         }
-        dialogConfirmButton.setOnClickListener(View.OnClickListener {
-            val inputValue = dialogInputView.text.toString().trim()
-            if (inputValue.isBlank()) {
-                "输入错误，请检查！".show(ctx)
-                return@OnClickListener
-            }
-            listener.onConfirmClick(selectedItem, inputValue)
+        dialogConfirmButton.setOnClickListener {
+            listener.onConfirmClick(selectedItem, dialogInputView.text.toString().trim())
             dismiss()
-        })
+        }
     }
 
     interface OnDialogButtonClickListener {

diff --git a/app/build.gradle b/app/build.gradle
index bf82a4c..87eac08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@
         applicationId "com.casic.detector"
         minSdkVersion 22
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0.0"
+        versionCode 1001
+        versionName "1.0.0.1"
 
         ndk {
             moduleName "serial_port"
@@ -60,7 +60,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "COM_TCY" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
+            outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
index 497f4bd..1c7d95b 100644
--- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
@@ -29,7 +29,7 @@
         return labelBeanDao.loadAll()
     }
 
-    fun loadLabelByCondition(selectedItem: String, value: String): MutableList<LabelBean> {
+    fun loadLabelByCondition(selectedItem: String, value: String?): MutableList<LabelBean> {
         val property = when (selectedItem) {
             LocaleConstant.SPINNER_ARRAY[0] -> LabelBeanDao.Properties.IdentifierId
             LocaleConstant.SPINNER_ARRAY[1] -> LabelBeanDao.Properties.Area
@@ -40,7 +40,11 @@
             LocaleConstant.SPINNER_ARRAY[6] -> LabelBeanDao.Properties.InstallTime
             else -> LabelBeanDao.Properties.Remark
         }
-        return labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        return if (value == null) {
+            labelBeanDao.queryBuilder().where(property.isNotNull).list()
+        } else {
+            labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        }
     }
 
     fun queryLabelById(identifierId: String): List<LabelBean> {
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 570dbc5..00e58d0 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -210,7 +210,6 @@
                 .setContext(context)
                 .setTitle("查看标识器")
                 .setSpinnerArray(LocaleConstant.SPINNER_ARRAY)
-                .setHintMessage("请输入查询条件")
                 .setNegativeButton("取消")
                 .setPositiveButton("确定")
                 .setOnDialogButtonClickListener(object :
diff --git a/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt b/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
index f453bc1..b661064 100644
--- a/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
+++ b/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
@@ -5,10 +5,15 @@
 import android.os.Bundle
 import android.view.View
 import android.widget.*
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView
 import com.casic.detector.R
+import com.casic.detector.utils.DataBaseManager
 import com.pengxh.kt.lite.extensions.initDialogLayoutParams
-import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.widget.DeleteEditText
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
 
 class QueryMarkerDialog private constructor(builder: Builder) : Dialog(
     builder.context, R.style.UserDefinedDialogStyle
@@ -16,7 +21,6 @@
     private val ctx = builder.context
     private val title = builder.title
     private val spinnerArray = builder.spinnerArray
-    private val hint = builder.hint
     private val positiveBtn = builder.positiveBtn
     private val negativeBtn = builder.negativeBtn
     private val listener = builder.listener
@@ -25,7 +29,6 @@
         lateinit var context: Context
         lateinit var title: String
         lateinit var spinnerArray: Array<String>
-        lateinit var hint: String
         lateinit var positiveBtn: String
         lateinit var negativeBtn: String
         lateinit var listener: OnDialogButtonClickListener
@@ -45,11 +48,6 @@
             return this
         }
 
-        fun setHintMessage(hint: String): Builder {
-            this.hint = hint
-            return this
-        }
-
         fun setPositiveButton(name: String): Builder {
             positiveBtn = name
             return this
@@ -83,7 +81,7 @@
     private fun initView() {
         val dialogTitleView: TextView = findViewById(R.id.dialogTitleView)
         val dialogSpinnerView: Spinner = findViewById(R.id.dialogSpinnerView)
-        val dialogInputView: DeleteEditText = findViewById(R.id.dialogInputView)
+        val dialogInputView: AppCompatAutoCompleteTextView = findViewById(R.id.dialogInputView)
         val dialogCancelButton = findViewById<Button>(R.id.dialogCancelButton)
         val dialogConfirmButton = findViewById<Button>(R.id.dialogConfirmButton)
         if (title.isNotBlank()) {
@@ -102,6 +100,33 @@
                     adapterView: AdapterView<*>?, view: View?, position: Int, id: Long
                 ) {
                     selectedItem = spinnerArray[position]
+                    //查库
+                    val autoCompleteData = HashSet<String>()
+                    CoroutineScope(Dispatchers.Main).launch {
+                        val labelBeans = withContext(Dispatchers.IO) {
+                            DataBaseManager.get.loadLabelByCondition(selectedItem, null)
+                        }
+                        for (labelBean in labelBeans) {
+                            when (position) {
+                                0 -> autoCompleteData.add(labelBean.identifierId)
+                                1 -> autoCompleteData.add(labelBean.area)
+                                2 -> autoCompleteData.add(labelBean.line)
+                                3 -> autoCompleteData.add(labelBean.road)
+                                4 -> autoCompleteData.add(labelBean.owner)
+                                5 -> autoCompleteData.add(labelBean.person)
+                                6 -> autoCompleteData.add(labelBean.installTime)
+                                else -> autoCompleteData.add(labelBean.remark)
+                            }
+                        }
+
+                        //AppCompatAutoCompleteTextView逻辑
+                        val autoCompleteAdapter = ArrayAdapter(
+                            ctx,
+                            android.R.layout.simple_dropdown_item_1line,
+                            autoCompleteData.toArray()
+                        )
+                        dialogInputView.setAdapter(autoCompleteAdapter)
+                    }
                 }
 
                 override fun onNothingSelected(p0: AdapterView<*>?) {
@@ -110,9 +135,6 @@
             }
         }
 
-        if (hint.isNotBlank()) {
-            dialogInputView.hint = hint
-        }
         if (negativeBtn.isNotBlank()) {
             dialogCancelButton.text = negativeBtn
         }
@@ -123,15 +145,10 @@
         if (positiveBtn.isNotBlank()) {
             dialogConfirmButton.text = positiveBtn
         }
-        dialogConfirmButton.setOnClickListener(View.OnClickListener {
-            val inputValue = dialogInputView.text.toString().trim()
-            if (inputValue.isBlank()) {
-                "输入错误，请检查！".show(ctx)
-                return@OnClickListener
-            }
-            listener.onConfirmClick(selectedItem, inputValue)
+        dialogConfirmButton.setOnClickListener {
+            listener.onConfirmClick(selectedItem, dialogInputView.text.toString().trim())
             dismiss()
-        })
+        }
     }
 
     interface OnDialogButtonClickListener {
diff --git a/app/src/main/res/layout/activity_search_label.xml b/app/src/main/res/layout/activity_search_label.xml
index 81d2ffa..f9fcd7e 100644
--- a/app/src/main/res/layout/activity_search_label.xml
+++ b/app/src/main/res/layout/activity_search_label.xml
@@ -47,7 +47,7 @@
             android:layout_centerInParent="true"
             android:layout_gravity="center"
             android:fontFamily="@font/digifaw"
-            android:text="10"
+            android:text="0"
             android:textColor="@color/white"
             android:textSize="70sp" />
 

diff --git a/app/build.gradle b/app/build.gradle
index bf82a4c..87eac08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@
         applicationId "com.casic.detector"
         minSdkVersion 22
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0.0"
+        versionCode 1001
+        versionName "1.0.0.1"
 
         ndk {
             moduleName "serial_port"
@@ -60,7 +60,7 @@
 
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "COM_TCY" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
+            outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
         }
     }
 
diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
index 497f4bd..1c7d95b 100644
--- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
+++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt
@@ -29,7 +29,7 @@
         return labelBeanDao.loadAll()
     }
 
-    fun loadLabelByCondition(selectedItem: String, value: String): MutableList<LabelBean> {
+    fun loadLabelByCondition(selectedItem: String, value: String?): MutableList<LabelBean> {
         val property = when (selectedItem) {
             LocaleConstant.SPINNER_ARRAY[0] -> LabelBeanDao.Properties.IdentifierId
             LocaleConstant.SPINNER_ARRAY[1] -> LabelBeanDao.Properties.Area
@@ -40,7 +40,11 @@
             LocaleConstant.SPINNER_ARRAY[6] -> LabelBeanDao.Properties.InstallTime
             else -> LabelBeanDao.Properties.Remark
         }
-        return labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        return if (value == null) {
+            labelBeanDao.queryBuilder().where(property.isNotNull).list()
+        } else {
+            labelBeanDao.queryBuilder().where(property.eq(value)).list()
+        }
     }
 
     fun queryLabelById(identifierId: String): List<LabelBean> {
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 570dbc5..00e58d0 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -210,7 +210,6 @@
                 .setContext(context)
                 .setTitle("查看标识器")
                 .setSpinnerArray(LocaleConstant.SPINNER_ARRAY)
-                .setHintMessage("请输入查询条件")
                 .setNegativeButton("取消")
                 .setPositiveButton("确定")
                 .setOnDialogButtonClickListener(object :
diff --git a/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt b/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
index f453bc1..b661064 100644
--- a/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
+++ b/app/src/main/java/com/casic/detector/widgets/QueryMarkerDialog.kt
@@ -5,10 +5,15 @@
 import android.os.Bundle
 import android.view.View
 import android.widget.*
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView
 import com.casic.detector.R
+import com.casic.detector.utils.DataBaseManager
 import com.pengxh.kt.lite.extensions.initDialogLayoutParams
-import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.widget.DeleteEditText
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
 
 class QueryMarkerDialog private constructor(builder: Builder) : Dialog(
     builder.context, R.style.UserDefinedDialogStyle
@@ -16,7 +21,6 @@
     private val ctx = builder.context
     private val title = builder.title
     private val spinnerArray = builder.spinnerArray
-    private val hint = builder.hint
     private val positiveBtn = builder.positiveBtn
     private val negativeBtn = builder.negativeBtn
     private val listener = builder.listener
@@ -25,7 +29,6 @@
         lateinit var context: Context
         lateinit var title: String
         lateinit var spinnerArray: Array<String>
-        lateinit var hint: String
         lateinit var positiveBtn: String
         lateinit var negativeBtn: String
         lateinit var listener: OnDialogButtonClickListener
@@ -45,11 +48,6 @@
             return this
         }
 
-        fun setHintMessage(hint: String): Builder {
-            this.hint = hint
-            return this
-        }
-
         fun setPositiveButton(name: String): Builder {
             positiveBtn = name
             return this
@@ -83,7 +81,7 @@
     private fun initView() {
         val dialogTitleView: TextView = findViewById(R.id.dialogTitleView)
         val dialogSpinnerView: Spinner = findViewById(R.id.dialogSpinnerView)
-        val dialogInputView: DeleteEditText = findViewById(R.id.dialogInputView)
+        val dialogInputView: AppCompatAutoCompleteTextView = findViewById(R.id.dialogInputView)
         val dialogCancelButton = findViewById<Button>(R.id.dialogCancelButton)
         val dialogConfirmButton = findViewById<Button>(R.id.dialogConfirmButton)
         if (title.isNotBlank()) {
@@ -102,6 +100,33 @@
                     adapterView: AdapterView<*>?, view: View?, position: Int, id: Long
                 ) {
                     selectedItem = spinnerArray[position]
+                    //查库
+                    val autoCompleteData = HashSet<String>()
+                    CoroutineScope(Dispatchers.Main).launch {
+                        val labelBeans = withContext(Dispatchers.IO) {
+                            DataBaseManager.get.loadLabelByCondition(selectedItem, null)
+                        }
+                        for (labelBean in labelBeans) {
+                            when (position) {
+                                0 -> autoCompleteData.add(labelBean.identifierId)
+                                1 -> autoCompleteData.add(labelBean.area)
+                                2 -> autoCompleteData.add(labelBean.line)
+                                3 -> autoCompleteData.add(labelBean.road)
+                                4 -> autoCompleteData.add(labelBean.owner)
+                                5 -> autoCompleteData.add(labelBean.person)
+                                6 -> autoCompleteData.add(labelBean.installTime)
+                                else -> autoCompleteData.add(labelBean.remark)
+                            }
+                        }
+
+                        //AppCompatAutoCompleteTextView逻辑
+                        val autoCompleteAdapter = ArrayAdapter(
+                            ctx,
+                            android.R.layout.simple_dropdown_item_1line,
+                            autoCompleteData.toArray()
+                        )
+                        dialogInputView.setAdapter(autoCompleteAdapter)
+                    }
                 }
 
                 override fun onNothingSelected(p0: AdapterView<*>?) {
@@ -110,9 +135,6 @@
             }
         }
 
-        if (hint.isNotBlank()) {
-            dialogInputView.hint = hint
-        }
         if (negativeBtn.isNotBlank()) {
             dialogCancelButton.text = negativeBtn
         }
@@ -123,15 +145,10 @@
         if (positiveBtn.isNotBlank()) {
             dialogConfirmButton.text = positiveBtn
         }
-        dialogConfirmButton.setOnClickListener(View.OnClickListener {
-            val inputValue = dialogInputView.text.toString().trim()
-            if (inputValue.isBlank()) {
-                "输入错误，请检查！".show(ctx)
-                return@OnClickListener
-            }
-            listener.onConfirmClick(selectedItem, inputValue)
+        dialogConfirmButton.setOnClickListener {
+            listener.onConfirmClick(selectedItem, dialogInputView.text.toString().trim())
             dismiss()
-        })
+        }
     }
 
     interface OnDialogButtonClickListener {
diff --git a/app/src/main/res/layout/activity_search_label.xml b/app/src/main/res/layout/activity_search_label.xml
index 81d2ffa..f9fcd7e 100644
--- a/app/src/main/res/layout/activity_search_label.xml
+++ b/app/src/main/res/layout/activity_search_label.xml
@@ -47,7 +47,7 @@
             android:layout_centerInParent="true"
             android:layout_gravity="center"
             android:fontFamily="@font/digifaw"
-            android:text="10"
+            android:text="0"
             android:textColor="@color/white"
             android:textSize="70sp" />
 
diff --git a/app/src/main/res/layout/dialog_query_marker.xml b/app/src/main/res/layout/dialog_query_marker.xml
index 678e51a..8245b7b 100644
--- a/app/src/main/res/layout/dialog_query_marker.xml
+++ b/app/src/main/res/layout/dialog_query_marker.xml
@@ -69,11 +69,13 @@
                 android:layout_weight="1"
                 android:background="@drawable/dialog_bg_hint_layout">
 
-                <com.pengxh.kt.lite.widget.DeleteEditText
+                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
                     android:id="@+id/dialogInputView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@null"
+                    android:completionThreshold="2"
+                    android:hint="请输入查询条件"
                     android:paddingHorizontal="@dimen/lib_dp_5"
                     android:paddingVertical="@dimen/lib_dp_7"
                     android:textColor="@color/lib_text_color"