diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
index 8d4fe45..3ef22c3 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
@@ -1,7 +1,7 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,28 +24,28 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.wellCodeView.text = rowsBean.wellCode
         holder.wellTypeView.text = rowsBean.wellTypeName
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.operationButton.text = "撤防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.redTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.redTextColor.covertColor(context))
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
+        holder.wellCodeView.text = rowsBean.wellCode
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+            holder.operationButton.text = "撤防"
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
             holder.operationButton.text = "布防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.greenTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.greenTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -64,8 +64,11 @@
     override fun getItemCount(): Int = dataRows.size
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
+        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
index 8d4fe45..3ef22c3 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
@@ -1,7 +1,7 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,28 +24,28 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.wellCodeView.text = rowsBean.wellCode
         holder.wellTypeView.text = rowsBean.wellTypeName
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.operationButton.text = "撤防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.redTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.redTextColor.covertColor(context))
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
+        holder.wellCodeView.text = rowsBean.wellCode
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+            holder.operationButton.text = "撤防"
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
             holder.operationButton.text = "布防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.greenTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.greenTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -64,8 +64,11 @@
     override fun getItemCount(): Int = dataRows.size
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
+        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 7a416d6..48a3f79 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@color/hintTextColor"
+    android:background="@color/mainBackground"
     android:orientation="horizontal">
 
     <LinearLayout

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
index 8d4fe45..3ef22c3 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
@@ -1,7 +1,7 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,28 +24,28 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.wellCodeView.text = rowsBean.wellCode
         holder.wellTypeView.text = rowsBean.wellTypeName
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.operationButton.text = "撤防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.redTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.redTextColor.covertColor(context))
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
+        holder.wellCodeView.text = rowsBean.wellCode
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+            holder.operationButton.text = "撤防"
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
             holder.operationButton.text = "布防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.greenTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.greenTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -64,8 +64,11 @@
     override fun getItemCount(): Int = dataRows.size
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
+        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 7a416d6..48a3f79 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@color/hintTextColor"
+    android:background="@color/mainBackground"
     android:orientation="horizontal">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_order_todo_recycleview.xml b/app/src/main/res/layout/item_order_todo_recycleview.xml
index 81cb9a8..cef7f1c 100644
--- a/app/src/main/res/layout/item_order_todo_recycleview.xml
+++ b/app/src/main/res/layout/item_order_todo_recycleview.xml
@@ -1,85 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/alarmContentView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView">
-
-                <TextView
-                    android:id="@+id/wellLocationView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toStartOf="@id/operationButton"
-                    android:text="航天二院203所航天二院203所"
-                    android:textSize="12sp" />
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/operationButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:paddingHorizontal="@dimen/dp_10"
-                    android:paddingVertical="3dp"
-                    android:text="接单"
-                    android:textColor="@color/white"
-                    app:qmui_backgroundColor="@color/mainThemeColor"
-                    app:qmui_borderColor="@color/mainThemeColor"
-                    app:qmui_radius="@dimen/dp_5" />
-            </RelativeLayout>
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/createTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2022-03-29 08:00:00"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/alarmValueView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/redTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+        android:id="@+id/operationButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_5"
+        android:text="接单"
+        android:textColor="@color/subTextColor"
+        app:qmui_backgroundColor="@color/mainBackground"
+        app:qmui_borderColor="@color/mainBackground"
+        app:qmui_radius="@dimen/dp_5" />
+</RelativeLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
index 8d4fe45..3ef22c3 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
@@ -1,7 +1,7 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,28 +24,28 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.wellCodeView.text = rowsBean.wellCode
         holder.wellTypeView.text = rowsBean.wellTypeName
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.operationButton.text = "撤防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.redTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.redTextColor.covertColor(context))
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
+        holder.wellCodeView.text = rowsBean.wellCode
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+            holder.operationButton.text = "撤防"
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
             holder.operationButton.text = "布防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.greenTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.greenTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -64,8 +64,11 @@
     override fun getItemCount(): Int = dataRows.size
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
+        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 7a416d6..48a3f79 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@color/hintTextColor"
+    android:background="@color/mainBackground"
     android:orientation="horizontal">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_order_todo_recycleview.xml b/app/src/main/res/layout/item_order_todo_recycleview.xml
index 81cb9a8..cef7f1c 100644
--- a/app/src/main/res/layout/item_order_todo_recycleview.xml
+++ b/app/src/main/res/layout/item_order_todo_recycleview.xml
@@ -1,85 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/alarmContentView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView">
-
-                <TextView
-                    android:id="@+id/wellLocationView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toStartOf="@id/operationButton"
-                    android:text="航天二院203所航天二院203所"
-                    android:textSize="12sp" />
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/operationButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:paddingHorizontal="@dimen/dp_10"
-                    android:paddingVertical="3dp"
-                    android:text="接单"
-                    android:textColor="@color/white"
-                    app:qmui_backgroundColor="@color/mainThemeColor"
-                    app:qmui_borderColor="@color/mainThemeColor"
-                    app:qmui_radius="@dimen/dp_5" />
-            </RelativeLayout>
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/createTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2022-03-29 08:00:00"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/alarmValueView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/redTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+        android:id="@+id/operationButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_5"
+        android:text="接单"
+        android:textColor="@color/subTextColor"
+        app:qmui_backgroundColor="@color/mainBackground"
+        app:qmui_borderColor="@color/mainBackground"
+        app:qmui_radius="@dimen/dp_5" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_order_undetermined_recycleview.xml b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
index 3fa246f..f86122e 100644
--- a/app/src/main/res/layout/item_order_undetermined_recycleview.xml
+++ b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
@@ -1,90 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_10">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="@dimen/dp_10">
+        android:layout_height="wrap_content">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView"
-                android:layout_centerVertical="true"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/currentStateView"
+        <LinearLayout
+            android:id="@+id/tempLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="@dimen/dp_10"
-            android:drawablePadding="@dimen/dp_5"
             android:gravity="center_vertical"
-            android:text="@string/app_name"
-            android:textColor="@color/mainThemeColor"
-            app:drawableStartCompat="@mipmap/clock" />
+            android:orientation="horizontal">
 
-        <!--放时间轴-->
+            <TextView
+                android:id="@+id/alarmContentView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_5"
+                android:layout_weight="1"
+                android:fontFamily="sans-serif-black"
+                android:text="@string/app_name"
+                android:textColor="@color/redTextColor"
+                android:textSize="@dimen/titleFontSize" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/arrowImageView"
+            <TextView
+                android:id="@+id/createTimeView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="@drawable/ic_down" />
-        </RelativeLayout>
+                android:text="2022-03-29 08:00:00"
+                android:textColor="@color/subTextColor" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="5.5"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/wellCodeView"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/currentStateView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:drawablePadding="@dimen/dp_5"
+        android:gravity="center_vertical"
+        android:text="@string/app_name"
+        android:textColor="@color/mainThemeColor"
+        app:drawableStartCompat="@mipmap/clock" />
+
+    <!--放时间轴-->
+
+    <LinearLayout
+        android:id="@+id/expandLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/arrowImageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_3"
+            android:src="@drawable/ic_down" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_3"
+            android:gravity="center_horizontal"
+            android:text="展开进展"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
index 8d4fe45..3ef22c3 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
@@ -1,7 +1,7 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,28 +24,28 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.wellCodeView.text = rowsBean.wellCode
         holder.wellTypeView.text = rowsBean.wellTypeName
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.operationButton.text = "撤防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.redTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.redTextColor.covertColor(context))
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
+        holder.wellCodeView.text = rowsBean.wellCode
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+            holder.operationButton.text = "撤防"
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
             holder.operationButton.text = "布防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.greenTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.greenTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -64,8 +64,11 @@
     override fun getItemCount(): Int = dataRows.size
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
+        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 7a416d6..48a3f79 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@color/hintTextColor"
+    android:background="@color/mainBackground"
     android:orientation="horizontal">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_order_todo_recycleview.xml b/app/src/main/res/layout/item_order_todo_recycleview.xml
index 81cb9a8..cef7f1c 100644
--- a/app/src/main/res/layout/item_order_todo_recycleview.xml
+++ b/app/src/main/res/layout/item_order_todo_recycleview.xml
@@ -1,85 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/alarmContentView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView">
-
-                <TextView
-                    android:id="@+id/wellLocationView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toStartOf="@id/operationButton"
-                    android:text="航天二院203所航天二院203所"
-                    android:textSize="12sp" />
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/operationButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:paddingHorizontal="@dimen/dp_10"
-                    android:paddingVertical="3dp"
-                    android:text="接单"
-                    android:textColor="@color/white"
-                    app:qmui_backgroundColor="@color/mainThemeColor"
-                    app:qmui_borderColor="@color/mainThemeColor"
-                    app:qmui_radius="@dimen/dp_5" />
-            </RelativeLayout>
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/createTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2022-03-29 08:00:00"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/alarmValueView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/redTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+        android:id="@+id/operationButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_5"
+        android:text="接单"
+        android:textColor="@color/subTextColor"
+        app:qmui_backgroundColor="@color/mainBackground"
+        app:qmui_borderColor="@color/mainBackground"
+        app:qmui_radius="@dimen/dp_5" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_order_undetermined_recycleview.xml b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
index 3fa246f..f86122e 100644
--- a/app/src/main/res/layout/item_order_undetermined_recycleview.xml
+++ b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
@@ -1,90 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_10">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="@dimen/dp_10">
+        android:layout_height="wrap_content">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView"
-                android:layout_centerVertical="true"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/currentStateView"
+        <LinearLayout
+            android:id="@+id/tempLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="@dimen/dp_10"
-            android:drawablePadding="@dimen/dp_5"
             android:gravity="center_vertical"
-            android:text="@string/app_name"
-            android:textColor="@color/mainThemeColor"
-            app:drawableStartCompat="@mipmap/clock" />
+            android:orientation="horizontal">
 
-        <!--放时间轴-->
+            <TextView
+                android:id="@+id/alarmContentView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_5"
+                android:layout_weight="1"
+                android:fontFamily="sans-serif-black"
+                android:text="@string/app_name"
+                android:textColor="@color/redTextColor"
+                android:textSize="@dimen/titleFontSize" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/arrowImageView"
+            <TextView
+                android:id="@+id/createTimeView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="@drawable/ic_down" />
-        </RelativeLayout>
+                android:text="2022-03-29 08:00:00"
+                android:textColor="@color/subTextColor" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="5.5"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/wellCodeView"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/currentStateView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:drawablePadding="@dimen/dp_5"
+        android:gravity="center_vertical"
+        android:text="@string/app_name"
+        android:textColor="@color/mainThemeColor"
+        app:drawableStartCompat="@mipmap/clock" />
+
+    <!--放时间轴-->
+
+    <LinearLayout
+        android:id="@+id/expandLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/arrowImageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_3"
+            android:src="@drawable/ic_down" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_3"
+            android:gravity="center_horizontal"
+            android:text="展开进展"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index dedbe41..b158bbc 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -1,89 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="80dp"
+    android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/wellTypeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/dp_5"
+            android:paddingVertical="2dp"
+            android:text="燃气井"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            app:qmui_backgroundColor="@color/hintTextColor"
+            app:qmui_borderColor="@color/hintTextColor"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <TextView
+            android:id="@+id/wellNameView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/operationButton"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/wellTypeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_5"
-                    android:paddingVertical="2dp"
-                    android:text="燃气井"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor"
-                    app:qmui_radius="@dimen/dp_3" />
-
-                <TextView
-                    android:id="@+id/wellCodeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_5"
-                    android:fontFamily="sans-serif-black"
-                    android:text="@string/app_name"
-                    android:textColor="@color/mainTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-            </LinearLayout>
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/operationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="布防"
-                android:textColor="@color/white"
-                app:qmui_backgroundColor="@color/greenTextColor"
-                app:qmui_borderColor="@color/greenTextColor"
-                app:qmui_radius="@dimen/dp_5" />
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toStartOf="@id/navigationButton"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/navigationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="前往"
-                android:textColor="@color/mainTextColor"
-                app:qmui_backgroundColor="@color/white"
-                app:qmui_borderColor="@color/hintTextColor"
-                app:qmui_radius="@dimen/dp_5" />
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/unknown"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/titleFontSize" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellDepthView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_marginTop="@dimen/dp_5">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_toStartOf="@id/operationButton"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_5"
+            android:text="前往"
+            android:textColor="@color/subTextColor"
+            app:qmui_backgroundColor="@color/mainBackground"
+            app:qmui_borderColor="@color/mainBackground"
+            app:qmui_radius="@dimen/dp_5" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_5"
+            android:text="布防"
+            android:textColor="@color/subTextColor"
+            app:qmui_backgroundColor="@color/mainBackground"
+            app:qmui_borderColor="@color/mainBackground"
+            app:qmui_radius="@dimen/dp_5" />
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
index 8d4fe45..3ef22c3 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
@@ -1,7 +1,7 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,28 +24,28 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.wellCodeView.text = rowsBean.wellCode
         holder.wellTypeView.text = rowsBean.wellTypeName
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.operationButton.text = "撤防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.redTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.redTextColor.covertColor(context))
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
+        holder.wellCodeView.text = rowsBean.wellCode
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+            holder.operationButton.text = "撤防"
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
             holder.operationButton.text = "布防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.greenTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.greenTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -64,8 +64,11 @@
     override fun getItemCount(): Int = dataRows.size
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
+        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 7a416d6..48a3f79 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@color/hintTextColor"
+    android:background="@color/mainBackground"
     android:orientation="horizontal">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_order_todo_recycleview.xml b/app/src/main/res/layout/item_order_todo_recycleview.xml
index 81cb9a8..cef7f1c 100644
--- a/app/src/main/res/layout/item_order_todo_recycleview.xml
+++ b/app/src/main/res/layout/item_order_todo_recycleview.xml
@@ -1,85 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/alarmContentView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView">
-
-                <TextView
-                    android:id="@+id/wellLocationView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toStartOf="@id/operationButton"
-                    android:text="航天二院203所航天二院203所"
-                    android:textSize="12sp" />
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/operationButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:paddingHorizontal="@dimen/dp_10"
-                    android:paddingVertical="3dp"
-                    android:text="接单"
-                    android:textColor="@color/white"
-                    app:qmui_backgroundColor="@color/mainThemeColor"
-                    app:qmui_borderColor="@color/mainThemeColor"
-                    app:qmui_radius="@dimen/dp_5" />
-            </RelativeLayout>
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/createTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2022-03-29 08:00:00"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/alarmValueView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/redTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+        android:id="@+id/operationButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_5"
+        android:text="接单"
+        android:textColor="@color/subTextColor"
+        app:qmui_backgroundColor="@color/mainBackground"
+        app:qmui_borderColor="@color/mainBackground"
+        app:qmui_radius="@dimen/dp_5" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_order_undetermined_recycleview.xml b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
index 3fa246f..f86122e 100644
--- a/app/src/main/res/layout/item_order_undetermined_recycleview.xml
+++ b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
@@ -1,90 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_10">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="@dimen/dp_10">
+        android:layout_height="wrap_content">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView"
-                android:layout_centerVertical="true"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/currentStateView"
+        <LinearLayout
+            android:id="@+id/tempLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="@dimen/dp_10"
-            android:drawablePadding="@dimen/dp_5"
             android:gravity="center_vertical"
-            android:text="@string/app_name"
-            android:textColor="@color/mainThemeColor"
-            app:drawableStartCompat="@mipmap/clock" />
+            android:orientation="horizontal">
 
-        <!--放时间轴-->
+            <TextView
+                android:id="@+id/alarmContentView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_5"
+                android:layout_weight="1"
+                android:fontFamily="sans-serif-black"
+                android:text="@string/app_name"
+                android:textColor="@color/redTextColor"
+                android:textSize="@dimen/titleFontSize" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/arrowImageView"
+            <TextView
+                android:id="@+id/createTimeView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="@drawable/ic_down" />
-        </RelativeLayout>
+                android:text="2022-03-29 08:00:00"
+                android:textColor="@color/subTextColor" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="5.5"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/wellCodeView"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/currentStateView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:drawablePadding="@dimen/dp_5"
+        android:gravity="center_vertical"
+        android:text="@string/app_name"
+        android:textColor="@color/mainThemeColor"
+        app:drawableStartCompat="@mipmap/clock" />
+
+    <!--放时间轴-->
+
+    <LinearLayout
+        android:id="@+id/expandLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/arrowImageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_3"
+            android:src="@drawable/ic_down" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_3"
+            android:gravity="center_horizontal"
+            android:text="展开进展"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index dedbe41..b158bbc 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -1,89 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="80dp"
+    android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/wellTypeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/dp_5"
+            android:paddingVertical="2dp"
+            android:text="燃气井"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            app:qmui_backgroundColor="@color/hintTextColor"
+            app:qmui_borderColor="@color/hintTextColor"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <TextView
+            android:id="@+id/wellNameView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/operationButton"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/wellTypeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_5"
-                    android:paddingVertical="2dp"
-                    android:text="燃气井"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor"
-                    app:qmui_radius="@dimen/dp_3" />
-
-                <TextView
-                    android:id="@+id/wellCodeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_5"
-                    android:fontFamily="sans-serif-black"
-                    android:text="@string/app_name"
-                    android:textColor="@color/mainTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-            </LinearLayout>
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/operationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="布防"
-                android:textColor="@color/white"
-                app:qmui_backgroundColor="@color/greenTextColor"
-                app:qmui_borderColor="@color/greenTextColor"
-                app:qmui_radius="@dimen/dp_5" />
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toStartOf="@id/navigationButton"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/navigationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="前往"
-                android:textColor="@color/mainTextColor"
-                app:qmui_backgroundColor="@color/white"
-                app:qmui_borderColor="@color/hintTextColor"
-                app:qmui_radius="@dimen/dp_5" />
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/unknown"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/titleFontSize" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellDepthView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_marginTop="@dimen/dp_5">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_toStartOf="@id/operationButton"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_5"
+            android:text="前往"
+            android:textColor="@color/subTextColor"
+            app:qmui_backgroundColor="@color/mainBackground"
+            app:qmui_borderColor="@color/mainBackground"
+            app:qmui_radius="@dimen/dp_5" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_5"
+            android:text="布防"
+            android:textColor="@color/subTextColor"
+            app:qmui_backgroundColor="@color/mainBackground"
+            app:qmui_borderColor="@color/mainBackground"
+            app:qmui_radius="@dimen/dp_5" />
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_recycleview.xml b/app/src/main/res/layout/item_well_recycleview.xml
index d956086..736ea4d 100644
--- a/app/src/main/res/layout/item_well_recycleview.xml
+++ b/app/src/main/res/layout/item_well_recycleview.xml
@@ -1,85 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="80dp"
+    android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/wellTypeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/dp_5"
+            android:paddingVertical="2dp"
+            android:text="燃气井"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            app:qmui_backgroundColor="@color/hintTextColor"
+            app:qmui_borderColor="@color/hintTextColor"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <TextView
+            android:id="@+id/wellNameView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical">
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/wellTypeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_5"
-                    android:paddingVertical="2dp"
-                    android:text="燃气井"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor"
-                    app:qmui_radius="@dimen/dp_3" />
-
-                <TextView
-                    android:id="@+id/wellCodeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_5"
-                    android:fontFamily="sans-serif-black"
-                    android:text="@string/app_name"
-                    android:textColor="@color/mainTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toStartOf="@id/navigationButton"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/navigationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="前往"
-                android:textColor="@color/white"
-                app:qmui_backgroundColor="@color/mainThemeColor"
-                app:qmui_borderColor="@color/mainThemeColor"
-                app:qmui_radius="@dimen/dp_5" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/dash_line_vertical" />
-
-        <ImageView
+        <TextView
             android:id="@+id/wellStateView"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_gravity="center" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/unknown"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/titleFontSize" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellDepthView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+        android:id="@+id/navigationButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_5"
+        android:text="前往"
+        android:textColor="@color/subTextColor"
+        app:qmui_backgroundColor="@color/mainBackground"
+        app:qmui_borderColor="@color/mainBackground"
+        app:qmui_radius="@dimen/dp_5" />
+</RelativeLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
index 8d84a0f..bf80515 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/TodoWorkOrderListAdapter.kt
@@ -30,9 +30,15 @@
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
         //绑定事件
         if (listener != null) {
@@ -47,9 +53,10 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
     }
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
index 1549504..89219ac 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/UndeterminedAdapterAdapter.kt
@@ -7,6 +7,7 @@
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
@@ -44,9 +45,15 @@
     ) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.alarmTypeView.text = rowsBean.alarmContentName
+        holder.alarmContentView.text = rowsBean.alarmContentName
         holder.createTimeView.text = rowsBean.createTime
         holder.wellCodeView.text = rowsBean.wellCode
+        val alarmValue = rowsBean.alarmValue.toString()
+        if (alarmValue == "") {
+            holder.alarmValueView.text = "报警值未知"
+        } else {
+            holder.alarmValueView.text = alarmValue
+        }
         holder.wellLocationView.text = rowsBean.position
 
         val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String
@@ -63,7 +70,7 @@
             holder.itemView.setOnClickListener {
                 listener!!.onClicked(position)
             }
-            holder.arrowImageView.setOnClickListener {
+            holder.expandLayout.setOnClickListener {
                 val rotateAnimation = holder.arrowImageView.animate()
                 rotateAnimation.duration = 300
                 rotateAnimation.interpolator = LinearInterpolator()
@@ -78,11 +85,14 @@
     }
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var alarmTypeView: TextView = view.findViewById(R.id.alarmTypeView)
+        var alarmContentView: TextView = view.findViewById(R.id.alarmContentView)
         var createTimeView: TextView = view.findViewById(R.id.createTimeView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var alarmValueView: TextView = view.findViewById(R.id.alarmValueView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var currentStateView: TextView = view.findViewById(R.id.currentStateView)
+
+        var expandLayout: LinearLayout = view.findViewById(R.id.expandLayout)
         var arrowImageView: ImageView = view.findViewById(R.id.arrowImageView)
     }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
index d5c580f..4be6da2 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt
@@ -1,18 +1,19 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.app.smartwell.R
+import com.casic.app.smartwell.extensions.covertColor
 import com.casic.app.smartwell.model.WellListModel
 import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class WellListAdapter(
-    context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
+    private val context: Context, private val dataRows: MutableList<WellListModel.DataBean.RowsBean>
 ) : RecyclerView.Adapter<WellListAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -23,16 +24,26 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
         holder.wellTypeView.text = rowsBean.wellTypeName
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
         holder.wellCodeView.text = rowsBean.wellCode
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.wellStateView.setImageResource(R.mipmap.ybf)
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
-            holder.wellStateView.setImageResource(R.mipmap.ycf)
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -49,10 +60,12 @@
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
         var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
-        var wellStateView: ImageView = view.findViewById(R.id.wellStateView)
     }
 
     private var listener: OnItemClickListener? = null
diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
index 8d4fe45..3ef22c3 100644
--- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
+++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt
@@ -1,7 +1,7 @@
 package com.casic.app.smartwell.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,28 +24,28 @@
         return ItemViewHolder(view)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         //绑定数据
         val rowsBean = dataRows[position]
-        holder.wellCodeView.text = rowsBean.wellCode
         holder.wellTypeView.text = rowsBean.wellTypeName
-        holder.wellLocationView.text = rowsBean.position
-        if (rowsBean.bfztName == "布防") {
-            holder.operationButton.text = "撤防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.redTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.redTextColor.covertColor(context))
+        holder.wellNameView.text = rowsBean.wellName
+        holder.wellStateView.text = "已${rowsBean.bfztName}"
+        holder.wellCodeView.text = rowsBean.wellCode
+        val deep = rowsBean.deep.toString()
+        if (deep == "") {
+            holder.wellDepthView.text = "井深未知"
         } else {
+            holder.wellDepthView.text = "${deep}m"
+        }
+        holder.wellLocationView.text = rowsBean.position
+
+        if (rowsBean.bfztName == "布防") {
+            holder.wellStateView.setTextColor(R.color.greenTextColor.covertColor(context))
+            holder.operationButton.text = "撤防"
+        } else {
+            holder.wellStateView.setTextColor(R.color.redTextColor.covertColor(context))
             holder.operationButton.text = "布防"
-            holder.operationButton.setStrokeColors(
-                ColorStateList.valueOf(
-                    R.color.greenTextColor.covertColor(context)
-                )
-            )
-            holder.operationButton.setBackgroundColor(R.color.greenTextColor.covertColor(context))
         }
         //绑定事件
         if (listener != null) {
@@ -64,8 +64,11 @@
     override fun getItemCount(): Int = dataRows.size
 
     inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
         var wellTypeView: QMUIRoundButton = view.findViewById(R.id.wellTypeView)
+        var wellNameView: TextView = view.findViewById(R.id.wellNameView)
+        var wellStateView: TextView = view.findViewById(R.id.wellStateView)
+        var wellCodeView: TextView = view.findViewById(R.id.wellCodeView)
+        var wellDepthView: TextView = view.findViewById(R.id.wellDepthView)
         var wellLocationView: TextView = view.findViewById(R.id.wellLocationView)
         var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton)
         var navigationButton: QMUIRoundButton = view.findViewById(R.id.navigationButton)
diff --git a/app/src/main/res/layout/include_search_bar.xml b/app/src/main/res/layout/include_search_bar.xml
index 7a416d6..48a3f79 100644
--- a/app/src/main/res/layout/include_search_bar.xml
+++ b/app/src/main/res/layout/include_search_bar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@color/hintTextColor"
+    android:background="@color/mainBackground"
     android:orientation="horizontal">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_order_todo_recycleview.xml b/app/src/main/res/layout/item_order_todo_recycleview.xml
index 81cb9a8..cef7f1c 100644
--- a/app/src/main/res/layout/item_order_todo_recycleview.xml
+++ b/app/src/main/res/layout/item_order_todo_recycleview.xml
@@ -1,85 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/alarmContentView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView">
-
-                <TextView
-                    android:id="@+id/wellLocationView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toStartOf="@id/operationButton"
-                    android:text="航天二院203所航天二院203所"
-                    android:textSize="12sp" />
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/operationButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:paddingHorizontal="@dimen/dp_10"
-                    android:paddingVertical="3dp"
-                    android:text="接单"
-                    android:textColor="@color/white"
-                    app:qmui_backgroundColor="@color/mainThemeColor"
-                    app:qmui_borderColor="@color/mainThemeColor"
-                    app:qmui_radius="@dimen/dp_5" />
-            </RelativeLayout>
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/createTimeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2022-03-29 08:00:00"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/alarmValueView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/redTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+        android:id="@+id/operationButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_5"
+        android:text="接单"
+        android:textColor="@color/subTextColor"
+        app:qmui_backgroundColor="@color/mainBackground"
+        app:qmui_borderColor="@color/mainBackground"
+        app:qmui_radius="@dimen/dp_5" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_order_undetermined_recycleview.xml b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
index 3fa246f..f86122e 100644
--- a/app/src/main/res/layout/item_order_undetermined_recycleview.xml
+++ b/app/src/main/res/layout/item_order_undetermined_recycleview.xml
@@ -1,90 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<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_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_10">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="@dimen/dp_10">
+        android:layout_height="wrap_content">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/tempLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/alarmTypeView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/dp_5"
-                    android:layout_weight="1"
-                    android:text="@string/app_name"
-                    android:textColor="@color/redTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-
-                <TextView
-                    android:id="@+id/createTimeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2022-03-29 08:00:00"
-                    android:textColor="@color/hintTextColor" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellCodeView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tempLayout"
-                android:paddingVertical="@dimen/dp_5"
-                android:text="N57S862"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/textFontSize" />
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wellCodeView"
-                android:layout_centerVertical="true"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/currentStateView"
+        <LinearLayout
+            android:id="@+id/tempLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="@dimen/dp_10"
-            android:drawablePadding="@dimen/dp_5"
             android:gravity="center_vertical"
-            android:text="@string/app_name"
-            android:textColor="@color/mainThemeColor"
-            app:drawableStartCompat="@mipmap/clock" />
+            android:orientation="horizontal">
 
-        <!--放时间轴-->
+            <TextView
+                android:id="@+id/alarmContentView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_5"
+                android:layout_weight="1"
+                android:fontFamily="sans-serif-black"
+                android:text="@string/app_name"
+                android:textColor="@color/redTextColor"
+                android:textSize="@dimen/titleFontSize" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/arrowImageView"
+            <TextView
+                android:id="@+id/createTimeView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="@drawable/ic_down" />
-        </RelativeLayout>
+                android:text="2022-03-29 08:00:00"
+                android:textColor="@color/subTextColor" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/wellCodeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="@string/app_name"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/alarmValueView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tempLayout"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="5.5"
+            android:textColor="@color/redTextColor"
+            android:textSize="@dimen/textFontSize" />
+
+        <TextView
+            android:id="@+id/wellLocationView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/wellCodeView"
+            android:layout_marginTop="@dimen/dp_5"
+            android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/textFontSize" />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/currentStateView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:drawablePadding="@dimen/dp_5"
+        android:gravity="center_vertical"
+        android:text="@string/app_name"
+        android:textColor="@color/mainThemeColor"
+        app:drawableStartCompat="@mipmap/clock" />
+
+    <!--放时间轴-->
+
+    <LinearLayout
+        android:id="@+id/expandLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/arrowImageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_3"
+            android:src="@drawable/ic_down" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_3"
+            android:gravity="center_horizontal"
+            android:text="展开进展"
+            android:textColor="@color/subTextColor" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_operation_recycleview.xml b/app/src/main/res/layout/item_well_operation_recycleview.xml
index dedbe41..b158bbc 100644
--- a/app/src/main/res/layout/item_well_operation_recycleview.xml
+++ b/app/src/main/res/layout/item_well_operation_recycleview.xml
@@ -1,89 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="80dp"
+    android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/wellTypeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/dp_5"
+            android:paddingVertical="2dp"
+            android:text="燃气井"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            app:qmui_backgroundColor="@color/hintTextColor"
+            app:qmui_borderColor="@color/hintTextColor"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <TextView
+            android:id="@+id/wellNameView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/operationButton"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/wellTypeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_5"
-                    android:paddingVertical="2dp"
-                    android:text="燃气井"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor"
-                    app:qmui_radius="@dimen/dp_3" />
-
-                <TextView
-                    android:id="@+id/wellCodeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_5"
-                    android:fontFamily="sans-serif-black"
-                    android:text="@string/app_name"
-                    android:textColor="@color/mainTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-            </LinearLayout>
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/operationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="布防"
-                android:textColor="@color/white"
-                app:qmui_backgroundColor="@color/greenTextColor"
-                app:qmui_borderColor="@color/greenTextColor"
-                app:qmui_radius="@dimen/dp_5" />
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toStartOf="@id/navigationButton"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/navigationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="前往"
-                android:textColor="@color/mainTextColor"
-                app:qmui_backgroundColor="@color/white"
-                app:qmui_borderColor="@color/hintTextColor"
-                app:qmui_radius="@dimen/dp_5" />
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/wellStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/unknown"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/titleFontSize" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellDepthView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_marginTop="@dimen/dp_5">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/navigationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_toStartOf="@id/operationButton"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_5"
+            android:text="前往"
+            android:textColor="@color/subTextColor"
+            app:qmui_backgroundColor="@color/mainBackground"
+            app:qmui_borderColor="@color/mainBackground"
+            app:qmui_radius="@dimen/dp_5" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/operationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_5"
+            android:text="布防"
+            android:textColor="@color/subTextColor"
+            app:qmui_backgroundColor="@color/mainBackground"
+            app:qmui_borderColor="@color/mainBackground"
+            app:qmui_radius="@dimen/dp_5" />
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_well_recycleview.xml b/app/src/main/res/layout/item_well_recycleview.xml
index d956086..736ea4d 100644
--- a/app/src/main/res/layout/item_well_recycleview.xml
+++ b/app/src/main/res/layout/item_well_recycleview.xml
@@ -1,85 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="80dp"
+    android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/dp_10"
     android:layout_marginBottom="@dimen/dp_10"
-    app:cardCornerRadius="@dimen/dp_5">
+    android:background="@drawable/bg_layout"
+    android:padding="@dimen/dp_10">
 
     <LinearLayout
+        android:id="@+id/tempLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/wellTypeView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/dp_5"
+            android:paddingVertical="2dp"
+            android:text="燃气井"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            app:qmui_backgroundColor="@color/hintTextColor"
+            app:qmui_borderColor="@color/hintTextColor"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <TextView
+            android:id="@+id/wellNameView"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
-            android:padding="@dimen/dp_10">
+            android:fontFamily="sans-serif-black"
+            android:text="@string/app_name"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/titleFontSize" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical">
-
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                    android:id="@+id/wellTypeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_5"
-                    android:paddingVertical="2dp"
-                    android:text="燃气井"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    app:qmui_backgroundColor="@color/hintTextColor"
-                    app:qmui_borderColor="@color/hintTextColor"
-                    app:qmui_radius="@dimen/dp_3" />
-
-                <TextView
-                    android:id="@+id/wellCodeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_5"
-                    android:fontFamily="sans-serif-black"
-                    android:text="@string/app_name"
-                    android:textColor="@color/mainTextColor"
-                    android:textSize="@dimen/titleFontSize" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wellLocationView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toStartOf="@id/navigationButton"
-                android:text="航天二院203所航天二院203所"
-                android:textSize="12sp" />
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                android:id="@+id/navigationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:paddingVertical="3dp"
-                android:text="前往"
-                android:textColor="@color/white"
-                app:qmui_backgroundColor="@color/mainThemeColor"
-                app:qmui_borderColor="@color/mainThemeColor"
-                app:qmui_radius="@dimen/dp_5" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/dash_line_vertical" />
-
-        <ImageView
+        <TextView
             android:id="@+id/wellStateView"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_gravity="center" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/unknown"
+            android:textColor="@color/subTextColor"
+            android:textSize="@dimen/titleFontSize" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/wellCodeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="@string/app_name"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellDepthView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tempLayout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="5.5"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <TextView
+        android:id="@+id/wellLocationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellCodeView"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所航天二院203所"
+        android:textColor="@color/subTextColor"
+        android:textSize="@dimen/textFontSize" />
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+        android:id="@+id/navigationButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wellLocationView"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_5"
+        android:text="前往"
+        android:textColor="@color/subTextColor"
+        app:qmui_backgroundColor="@color/mainBackground"
+        app:qmui_borderColor="@color/mainBackground"
+        app:qmui_radius="@dimen/dp_5" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9126849..11203a6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
 <resources>
     <color name="mainThemeColor">#034099</color>
     <color name="mainTextColor">#333333</color>
+    <color name="subTextColor">#626262</color>
     <color name="mainBackColor">#F7F7F7</color>
     <color name="hintTextColor">#CCCCCC</color>
     <color name="greenTextColor">#13AD00</color>