diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {
diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
index df365d8..c4dc638 100644
--- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
+++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
@@ -4,7 +4,6 @@
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.util.Log
 import com.casic.br.ar.app.databinding.DialogDetectResultBinding
 import com.casic.br.ar.app.extensions.compressImage
 import com.casic.br.ar.app.utils.LocaleConstant
@@ -30,7 +29,7 @@
         super.onCreate(savedInstanceState)
         initDialogLayoutParams(0.8f)
 
-        binding.confirmButton.setOnClickListener {
+        binding.checkPassButton.setOnClickListener {
             //mat转图片
             val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
             Utils.matToBitmap(mat, bitmap, true)
@@ -40,8 +39,7 @@
             //压缩
             imagePath.compressImage(context, object : OnImageCompressListener {
                 override fun onSuccess(file: File) {
-                    Log.d(kTag, "absolutePath: ${file.absolutePath}")
-                    listener.onConfirmClick(file)
+                    listener.onCheckPassClick(file)
                     dismiss()
                 }
 
@@ -51,7 +49,25 @@
             })
         }
 
-        binding.cancelButton.setOnClickListener { dismiss() }
+        binding.haveTroubleButton.setOnClickListener {
+            //mat转图片
+            val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
+            Utils.matToBitmap(mat, bitmap, true)
+            val imagePath = "${context.createImageFileDir()}/${System.currentTimeMillis()}.png"
+            bitmap.saveImage(imagePath)
+
+            //压缩
+            imagePath.compressImage(context, object : OnImageCompressListener {
+                override fun onSuccess(file: File) {
+                    listener.onHaveTroubleClick(file)
+                    dismiss()
+                }
+
+                override fun onError(e: Throwable) {
+                    e.printStackTrace()
+                }
+            })
+        }
     }
 
     fun updateDialogContentView(
@@ -70,6 +86,7 @@
     }
 
     interface OnDialogButtonClickListener {
-        fun onConfirmClick(file: File)
+        fun onCheckPassClick(file: File)
+        fun onHaveTroubleClick(file: File)
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {
diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
index df365d8..c4dc638 100644
--- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
+++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
@@ -4,7 +4,6 @@
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.util.Log
 import com.casic.br.ar.app.databinding.DialogDetectResultBinding
 import com.casic.br.ar.app.extensions.compressImage
 import com.casic.br.ar.app.utils.LocaleConstant
@@ -30,7 +29,7 @@
         super.onCreate(savedInstanceState)
         initDialogLayoutParams(0.8f)
 
-        binding.confirmButton.setOnClickListener {
+        binding.checkPassButton.setOnClickListener {
             //mat转图片
             val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
             Utils.matToBitmap(mat, bitmap, true)
@@ -40,8 +39,7 @@
             //压缩
             imagePath.compressImage(context, object : OnImageCompressListener {
                 override fun onSuccess(file: File) {
-                    Log.d(kTag, "absolutePath: ${file.absolutePath}")
-                    listener.onConfirmClick(file)
+                    listener.onCheckPassClick(file)
                     dismiss()
                 }
 
@@ -51,7 +49,25 @@
             })
         }
 
-        binding.cancelButton.setOnClickListener { dismiss() }
+        binding.haveTroubleButton.setOnClickListener {
+            //mat转图片
+            val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
+            Utils.matToBitmap(mat, bitmap, true)
+            val imagePath = "${context.createImageFileDir()}/${System.currentTimeMillis()}.png"
+            bitmap.saveImage(imagePath)
+
+            //压缩
+            imagePath.compressImage(context, object : OnImageCompressListener {
+                override fun onSuccess(file: File) {
+                    listener.onHaveTroubleClick(file)
+                    dismiss()
+                }
+
+                override fun onError(e: Throwable) {
+                    e.printStackTrace()
+                }
+            })
+        }
     }
 
     fun updateDialogContentView(
@@ -70,6 +86,7 @@
     }
 
     interface OnDialogButtonClickListener {
-        fun onConfirmClick(file: File)
+        fun onCheckPassClick(file: File)
+        fun onHaveTroubleClick(file: File)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml b/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
deleted file mode 100644
index 4bcce86..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/hintColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80CCCCCC" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {
diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
index df365d8..c4dc638 100644
--- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
+++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
@@ -4,7 +4,6 @@
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.util.Log
 import com.casic.br.ar.app.databinding.DialogDetectResultBinding
 import com.casic.br.ar.app.extensions.compressImage
 import com.casic.br.ar.app.utils.LocaleConstant
@@ -30,7 +29,7 @@
         super.onCreate(savedInstanceState)
         initDialogLayoutParams(0.8f)
 
-        binding.confirmButton.setOnClickListener {
+        binding.checkPassButton.setOnClickListener {
             //mat转图片
             val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
             Utils.matToBitmap(mat, bitmap, true)
@@ -40,8 +39,7 @@
             //压缩
             imagePath.compressImage(context, object : OnImageCompressListener {
                 override fun onSuccess(file: File) {
-                    Log.d(kTag, "absolutePath: ${file.absolutePath}")
-                    listener.onConfirmClick(file)
+                    listener.onCheckPassClick(file)
                     dismiss()
                 }
 
@@ -51,7 +49,25 @@
             })
         }
 
-        binding.cancelButton.setOnClickListener { dismiss() }
+        binding.haveTroubleButton.setOnClickListener {
+            //mat转图片
+            val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
+            Utils.matToBitmap(mat, bitmap, true)
+            val imagePath = "${context.createImageFileDir()}/${System.currentTimeMillis()}.png"
+            bitmap.saveImage(imagePath)
+
+            //压缩
+            imagePath.compressImage(context, object : OnImageCompressListener {
+                override fun onSuccess(file: File) {
+                    listener.onHaveTroubleClick(file)
+                    dismiss()
+                }
+
+                override fun onError(e: Throwable) {
+                    e.printStackTrace()
+                }
+            })
+        }
     }
 
     fun updateDialogContentView(
@@ -70,6 +86,7 @@
     }
 
     interface OnDialogButtonClickListener {
-        fun onConfirmClick(file: File)
+        fun onCheckPassClick(file: File)
+        fun onHaveTroubleClick(file: File)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml b/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
deleted file mode 100644
index 4bcce86..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/hintColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80CCCCCC" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_purple_5.xml b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
new file mode 100644
index 0000000..ece8881
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/themeColor" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/themeOpacityColor" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {
diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
index df365d8..c4dc638 100644
--- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
+++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
@@ -4,7 +4,6 @@
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.util.Log
 import com.casic.br.ar.app.databinding.DialogDetectResultBinding
 import com.casic.br.ar.app.extensions.compressImage
 import com.casic.br.ar.app.utils.LocaleConstant
@@ -30,7 +29,7 @@
         super.onCreate(savedInstanceState)
         initDialogLayoutParams(0.8f)
 
-        binding.confirmButton.setOnClickListener {
+        binding.checkPassButton.setOnClickListener {
             //mat转图片
             val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
             Utils.matToBitmap(mat, bitmap, true)
@@ -40,8 +39,7 @@
             //压缩
             imagePath.compressImage(context, object : OnImageCompressListener {
                 override fun onSuccess(file: File) {
-                    Log.d(kTag, "absolutePath: ${file.absolutePath}")
-                    listener.onConfirmClick(file)
+                    listener.onCheckPassClick(file)
                     dismiss()
                 }
 
@@ -51,7 +49,25 @@
             })
         }
 
-        binding.cancelButton.setOnClickListener { dismiss() }
+        binding.haveTroubleButton.setOnClickListener {
+            //mat转图片
+            val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
+            Utils.matToBitmap(mat, bitmap, true)
+            val imagePath = "${context.createImageFileDir()}/${System.currentTimeMillis()}.png"
+            bitmap.saveImage(imagePath)
+
+            //压缩
+            imagePath.compressImage(context, object : OnImageCompressListener {
+                override fun onSuccess(file: File) {
+                    listener.onHaveTroubleClick(file)
+                    dismiss()
+                }
+
+                override fun onError(e: Throwable) {
+                    e.printStackTrace()
+                }
+            })
+        }
     }
 
     fun updateDialogContentView(
@@ -70,6 +86,7 @@
     }
 
     interface OnDialogButtonClickListener {
-        fun onConfirmClick(file: File)
+        fun onCheckPassClick(file: File)
+        fun onHaveTroubleClick(file: File)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml b/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
deleted file mode 100644
index 4bcce86..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/hintColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80CCCCCC" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_purple_5.xml b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
new file mode 100644
index 0000000..ece8881
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/themeColor" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/themeOpacityColor" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_red_22.xml b/app/src/main/res/drawable/button_dialog_selector_red_22.xml
deleted file mode 100644
index 3983cdc..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_red_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/red" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/opacityRed" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {
diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
index df365d8..c4dc638 100644
--- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
+++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
@@ -4,7 +4,6 @@
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.util.Log
 import com.casic.br.ar.app.databinding.DialogDetectResultBinding
 import com.casic.br.ar.app.extensions.compressImage
 import com.casic.br.ar.app.utils.LocaleConstant
@@ -30,7 +29,7 @@
         super.onCreate(savedInstanceState)
         initDialogLayoutParams(0.8f)
 
-        binding.confirmButton.setOnClickListener {
+        binding.checkPassButton.setOnClickListener {
             //mat转图片
             val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
             Utils.matToBitmap(mat, bitmap, true)
@@ -40,8 +39,7 @@
             //压缩
             imagePath.compressImage(context, object : OnImageCompressListener {
                 override fun onSuccess(file: File) {
-                    Log.d(kTag, "absolutePath: ${file.absolutePath}")
-                    listener.onConfirmClick(file)
+                    listener.onCheckPassClick(file)
                     dismiss()
                 }
 
@@ -51,7 +49,25 @@
             })
         }
 
-        binding.cancelButton.setOnClickListener { dismiss() }
+        binding.haveTroubleButton.setOnClickListener {
+            //mat转图片
+            val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
+            Utils.matToBitmap(mat, bitmap, true)
+            val imagePath = "${context.createImageFileDir()}/${System.currentTimeMillis()}.png"
+            bitmap.saveImage(imagePath)
+
+            //压缩
+            imagePath.compressImage(context, object : OnImageCompressListener {
+                override fun onSuccess(file: File) {
+                    listener.onHaveTroubleClick(file)
+                    dismiss()
+                }
+
+                override fun onError(e: Throwable) {
+                    e.printStackTrace()
+                }
+            })
+        }
     }
 
     fun updateDialogContentView(
@@ -70,6 +86,7 @@
     }
 
     interface OnDialogButtonClickListener {
-        fun onConfirmClick(file: File)
+        fun onCheckPassClick(file: File)
+        fun onHaveTroubleClick(file: File)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml b/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
deleted file mode 100644
index 4bcce86..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/hintColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80CCCCCC" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_purple_5.xml b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
new file mode 100644
index 0000000..ece8881
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/themeColor" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/themeOpacityColor" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_red_22.xml b/app/src/main/res/drawable/button_dialog_selector_red_22.xml
deleted file mode 100644
index 3983cdc..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_red_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/red" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/opacityRed" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_red_5.xml b/app/src/main/res/drawable/button_dialog_selector_red_5.xml
new file mode 100644
index 0000000..a19439e
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_red_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/red" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/opacityRed" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {
diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
index df365d8..c4dc638 100644
--- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
+++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
@@ -4,7 +4,6 @@
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.util.Log
 import com.casic.br.ar.app.databinding.DialogDetectResultBinding
 import com.casic.br.ar.app.extensions.compressImage
 import com.casic.br.ar.app.utils.LocaleConstant
@@ -30,7 +29,7 @@
         super.onCreate(savedInstanceState)
         initDialogLayoutParams(0.8f)
 
-        binding.confirmButton.setOnClickListener {
+        binding.checkPassButton.setOnClickListener {
             //mat转图片
             val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
             Utils.matToBitmap(mat, bitmap, true)
@@ -40,8 +39,7 @@
             //压缩
             imagePath.compressImage(context, object : OnImageCompressListener {
                 override fun onSuccess(file: File) {
-                    Log.d(kTag, "absolutePath: ${file.absolutePath}")
-                    listener.onConfirmClick(file)
+                    listener.onCheckPassClick(file)
                     dismiss()
                 }
 
@@ -51,7 +49,25 @@
             })
         }
 
-        binding.cancelButton.setOnClickListener { dismiss() }
+        binding.haveTroubleButton.setOnClickListener {
+            //mat转图片
+            val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
+            Utils.matToBitmap(mat, bitmap, true)
+            val imagePath = "${context.createImageFileDir()}/${System.currentTimeMillis()}.png"
+            bitmap.saveImage(imagePath)
+
+            //压缩
+            imagePath.compressImage(context, object : OnImageCompressListener {
+                override fun onSuccess(file: File) {
+                    listener.onHaveTroubleClick(file)
+                    dismiss()
+                }
+
+                override fun onError(e: Throwable) {
+                    e.printStackTrace()
+                }
+            })
+        }
     }
 
     fun updateDialogContentView(
@@ -70,6 +86,7 @@
     }
 
     interface OnDialogButtonClickListener {
-        fun onConfirmClick(file: File)
+        fun onCheckPassClick(file: File)
+        fun onHaveTroubleClick(file: File)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml b/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
deleted file mode 100644
index 4bcce86..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/hintColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80CCCCCC" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_purple_5.xml b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
new file mode 100644
index 0000000..ece8881
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/themeColor" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/themeOpacityColor" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_red_22.xml b/app/src/main/res/drawable/button_dialog_selector_red_22.xml
deleted file mode 100644
index 3983cdc..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_red_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/red" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/opacityRed" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_red_5.xml b/app/src/main/res/drawable/button_dialog_selector_red_5.xml
new file mode 100644
index 0000000..a19439e
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_red_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/red" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/opacityRed" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml
index edb662c..64024db 100644
--- a/app/src/main/res/layout/activity_check_result.xml
+++ b/app/src/main/res/layout/activity_check_result.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
@@ -20,20 +19,12 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_15"
             android:gravity="center"
-            android:text="本次检查结果"
+            android:text="结束检查"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_18"
             android:textStyle="bold" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="3" />
-
         <com.pengxh.kt.lite.widget.DeleteEditText
             android:id="@+id/inputSiteView"
             android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
index 71adcf5..178898d 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt
@@ -68,6 +68,7 @@
     private var alarmCode = ""
     private var checkItemCount = 0
     private var checkPassCount = 0
+    private var troubleCount = 0
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -158,7 +159,7 @@
         AlertControlDialog.Builder()
             .setContext(this)
             .setTitle("温馨提示")
-            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${checkItemCount - checkPassCount}项隐患，是否结束检查？")
+            .setMessage("所有检查均已完成，共${checkPassCount}项通过，存在${troubleCount}项隐患，是否结束检查？")
             .setNegativeButton("取消")
             .setPositiveButton("结束检查")
             .setOnDialogButtonClickListener(object :
@@ -507,19 +508,24 @@
                 if (mat.width() > 0 || mat.height() > 0) {
                     detectResultDialog.updateDialogContentView(target, mat,
                         object : DetectResultDialog.OnDialogButtonClickListener {
-                            override fun onConfirmClick(file: File) {
+                            override fun onCheckPassClick(file: File) {
                                 imageFileViewModel.uploadImage(file)
                                 detectedTargetSet.add(target)
 
-                                if (target.isNumber()) {
-                                    checkPassCount++
-                                    binding.checkedCountView.text = "${checkPassCount}项"
-                                    binding.noCheckCountView.text = "${checkItemCount - checkPassCount}项"
-                                    if (checkItemCount - checkPassCount == 0) {
-                                        stopCheck()
-                                    }
+                                checkPassCount++
+                                binding.checkedCountView.text = "${checkPassCount}项"
+                                if (checkItemCount - checkPassCount == 0) {
+                                    stopCheck()
                                 }
                             }
+
+                            override fun onHaveTroubleClick(file: File) {
+                                imageFileViewModel.uploadImage(file)
+                                detectedTargetSet.add(target)
+
+                                troubleCount++
+                                binding.noCheckCountView.text = "${troubleCount}项"
+                            }
                         }).show()
                 }
             }
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
index f9fa398..b88b940 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt
@@ -4,13 +4,9 @@
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.casic.br.ar.app.R
 import com.casic.br.ar.app.databinding.ActivityCheckResultBinding
-import com.casic.br.ar.app.model.HiddenTroubleListResultModel
 import com.casic.br.ar.app.utils.RuntimeCache
 import com.casic.br.ar.app.vm.InspectionViewModel
-import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
-import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToCompleteDate
@@ -35,23 +31,6 @@
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
         inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java]
-        inspectionViewModel.getHiddenTroublesByInspectionId(this, RuntimeCache.inspectionId)
-        inspectionViewModel.troublesResultModel.observe(this) {
-            if (it.code == 200) {
-                val troublesAdapter = object :
-                    NormalRecyclerAdapter<HiddenTroubleListResultModel.DataModel>(
-                        R.layout.item_hidden_trouble_by_id_l, it.data
-                    ) {
-                    override fun convertView(
-                        viewHolder: ViewHolder, position: Int,
-                        item: HiddenTroubleListResultModel.DataModel
-                    ) {
-                        viewHolder.setText(R.id.troubleNameView, item.name)
-                    }
-                }
-                binding.recyclerView.adapter = troublesAdapter
-            }
-        }
     }
 
     override fun initViewBinding(): ActivityCheckResultBinding {
diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
index df365d8..c4dc638 100644
--- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
+++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt
@@ -4,7 +4,6 @@
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.util.Log
 import com.casic.br.ar.app.databinding.DialogDetectResultBinding
 import com.casic.br.ar.app.extensions.compressImage
 import com.casic.br.ar.app.utils.LocaleConstant
@@ -30,7 +29,7 @@
         super.onCreate(savedInstanceState)
         initDialogLayoutParams(0.8f)
 
-        binding.confirmButton.setOnClickListener {
+        binding.checkPassButton.setOnClickListener {
             //mat转图片
             val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
             Utils.matToBitmap(mat, bitmap, true)
@@ -40,8 +39,7 @@
             //压缩
             imagePath.compressImage(context, object : OnImageCompressListener {
                 override fun onSuccess(file: File) {
-                    Log.d(kTag, "absolutePath: ${file.absolutePath}")
-                    listener.onConfirmClick(file)
+                    listener.onCheckPassClick(file)
                     dismiss()
                 }
 
@@ -51,7 +49,25 @@
             })
         }
 
-        binding.cancelButton.setOnClickListener { dismiss() }
+        binding.haveTroubleButton.setOnClickListener {
+            //mat转图片
+            val bitmap = Bitmap.createBitmap(mat.width(), mat.height(), Bitmap.Config.ARGB_8888)
+            Utils.matToBitmap(mat, bitmap, true)
+            val imagePath = "${context.createImageFileDir()}/${System.currentTimeMillis()}.png"
+            bitmap.saveImage(imagePath)
+
+            //压缩
+            imagePath.compressImage(context, object : OnImageCompressListener {
+                override fun onSuccess(file: File) {
+                    listener.onHaveTroubleClick(file)
+                    dismiss()
+                }
+
+                override fun onError(e: Throwable) {
+                    e.printStackTrace()
+                }
+            })
+        }
     }
 
     fun updateDialogContentView(
@@ -70,6 +86,7 @@
     }
 
     interface OnDialogButtonClickListener {
-        fun onConfirmClick(file: File)
+        fun onCheckPassClick(file: File)
+        fun onHaveTroubleClick(file: File)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml b/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
deleted file mode 100644
index 4bcce86..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_gray_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/hintColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80CCCCCC" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_purple_5.xml b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
new file mode 100644
index 0000000..ece8881
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_purple_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/themeColor" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/themeOpacityColor" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_red_22.xml b/app/src/main/res/drawable/button_dialog_selector_red_22.xml
deleted file mode 100644
index 3983cdc..0000000
--- a/app/src/main/res/drawable/button_dialog_selector_red_22.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="22dp" />
-            <solid android:color="@color/red" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="22dp" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/opacityRed" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_dialog_selector_red_5.xml b/app/src/main/res/drawable/button_dialog_selector_red_5.xml
new file mode 100644
index 0000000..a19439e
--- /dev/null
+++ b/app/src/main/res/drawable/button_dialog_selector_red_5.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/red" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/dp_5" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="@color/opacityRed" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml
index edb662c..64024db 100644
--- a/app/src/main/res/layout/activity_check_result.xml
+++ b/app/src/main/res/layout/activity_check_result.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
@@ -20,20 +19,12 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_15"
             android:gravity="center"
-            android:text="本次检查结果"
+            android:text="结束检查"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_18"
             android:textStyle="bold" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="3" />
-
         <com.pengxh.kt.lite.widget.DeleteEditText
             android:id="@+id/inputSiteView"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_detect_result.xml b/app/src/main/res/layout/dialog_detect_result.xml
index eb1876b..e22b9c9 100644
--- a/app/src/main/res/layout/dialog_detect_result.xml
+++ b/app/src/main/res/layout/dialog_detect_result.xml
@@ -33,24 +33,24 @@
         android:orientation="horizontal">
 
         <Button
-            android:id="@+id/confirmButton"
+            android:id="@+id/checkPassButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="@dimen/dp_15"
             android:layout_weight="1"
-            android:background="@drawable/button_dialog_selector_red_22"
-            android:text="确认"
+            android:background="@drawable/button_dialog_selector_purple_5"
+            android:text="检查通过"
             android:textColor="@color/white"
             android:textSize="@dimen/lib_sp_16" />
 
         <Button
-            android:id="@+id/cancelButton"
+            android:id="@+id/haveTroubleButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/dp_15"
             android:layout_weight="1"
-            android:background="@drawable/button_dialog_selector_gray_22"
-            android:text="识别错误"
+            android:background="@drawable/button_dialog_selector_red_5"
+            android:text="存在隐患"
             android:textColor="@color/white"
             android:textSize="@dimen/lib_sp_16" />
     </LinearLayout>