diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index 0e95a77..7637aaf 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -42,7 +42,13 @@
         "备注"
     )
     var PIPE_MATERIAL_ARRAY = arrayOf("铸铁", "塑料")
-    var DOWN_PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
+    var ATTACH_NAME_ARRAY = arrayOf("管井", "阀门", "管堵", "阀门井")
+    var FEATURE_NAME_ARRAY = arrayOf(
+        "转折点", "变径点", "三通", "四通", "套管", "大小头",
+        "弯头", "预留端口", "绝缘接头", "腐蚀抢修", "外界破坏抢修", "高程变化", "穿河流两端",
+        "密封端头（盲板）", "绝缘接头", "塑钢转换", "顶管", "牺牲阳极", "变坡"
+    )
+    var PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
     var BURY_METHOD_ARRAY = arrayOf("直埋", "圆管", "管块", "管沟", "架空")
     var IDENTIFIER_TYPE_ARRAY = arrayOf("EM30", "EM50", "EM14")
     var COLOR_ARRAY = arrayOf("蓝色", "橙色", "红色", "黑色", "紫色", "黄色", "绿色")

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index 0e95a77..7637aaf 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -42,7 +42,13 @@
         "备注"
     )
     var PIPE_MATERIAL_ARRAY = arrayOf("铸铁", "塑料")
-    var DOWN_PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
+    var ATTACH_NAME_ARRAY = arrayOf("管井", "阀门", "管堵", "阀门井")
+    var FEATURE_NAME_ARRAY = arrayOf(
+        "转折点", "变径点", "三通", "四通", "套管", "大小头",
+        "弯头", "预留端口", "绝缘接头", "腐蚀抢修", "外界破坏抢修", "高程变化", "穿河流两端",
+        "密封端头（盲板）", "绝缘接头", "塑钢转换", "顶管", "牺牲阳极", "变坡"
+    )
+    var PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
     var BURY_METHOD_ARRAY = arrayOf("直埋", "圆管", "管块", "管沟", "架空")
     var IDENTIFIER_TYPE_ARRAY = arrayOf("EM30", "EM50", "EM14")
     var COLOR_ARRAY = arrayOf("蓝色", "橙色", "红色", "黑色", "紫色", "黄色", "绿色")
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index bb448fe..ec2c6a9 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -18,6 +18,7 @@
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.RotateAnimation
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.amap.api.location.AMapLocation
@@ -896,11 +897,59 @@
                 dismiss()
             }
 
+            binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                    ) {
+                        when (position) {
+                            0 -> {
+                                //显示管线属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.VISIBLE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                //显示管线附属物属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            2 -> {
+                                //显示管线特征点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            3 -> {
+                                //显示交叉穿越点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility =
+                                    View.VISIBLE
+                            }
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {
+
+                    }
+                }
+
             //安装
             binding.installButton.setOnClickListener {
                 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") as String
                 val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String
-                if (binding.objectInclude.markerObjectTypeView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.markerObjectTypeView.text.isNullOrBlank()) {
                     when (binding.objectInclude.objectTypeSpinner.selectedItem.toString()) {
                         "管线" -> "请输入管线种类！".show(context)
                         "管线附属物" -> "请输入附属物名称！".show(context)
@@ -910,17 +959,17 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
                     "请输入管径".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.buryDeepView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
                     "请输入埋深".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.downPipeDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
                     "请输入下层管管径".show(context)
                     return@setOnClickListener
                 }
@@ -972,15 +1021,15 @@
                 taskViewModel.installLabel(
                     companyId,
                     binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(),
-                    binding.objectInclude.markerObjectTypeView.text.toString(),
-                    binding.objectInclude.materialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.pipelineDiameterView.text}mm",
-                    "${binding.objectInclude.buryDeepView.text}mm",
-                    binding.objectInclude.downPipeTypeSpinner.selectedItem.toString(),
-                    binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.downPipeDiameterView.text}mm",
-                    "${binding.objectInclude.downPointDeepView.text}mm",
-                    binding.objectInclude.buryMethodSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(),
+                    binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm",
+                    "${binding.objectInclude.pipeInclude.buryDeepView.text}mm",
+                    binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm",
+                    "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm",
+                    binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString(),
                     binding.objectInclude.areaView.text.toString(),
                     binding.objectInclude.lineView.text.toString(),
                     binding.objectInclude.roadView.text.toString(),
@@ -1000,11 +1049,11 @@
                 )
 
                 //保存默认值
-                "markerObjectTypeView".setDefaultValue(binding.objectInclude.markerObjectTypeView.text.toString())
-                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipelineDiameterView.text.toString())
-                "buryDeepView".setDefaultValue(binding.objectInclude.buryDeepView.text.toString())
-                "downPipeDiameterView".setDefaultValue(binding.objectInclude.downPipeDiameterView.text.toString())
-                "downPointDeepView".setDefaultValue(binding.objectInclude.downPointDeepView.text.toString())
+                "markerObjectTypeView".setDefaultValue(binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString())
+                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipeInclude.pipelineDiameterView.text.toString())
+                "buryDeepView".setDefaultValue(binding.objectInclude.pipeInclude.buryDeepView.text.toString())
+                "bottomPipeDiameterView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.toString())
+                "bottomPointDeepView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text.toString())
                 "areaView".setDefaultValue(binding.objectInclude.areaView.text.toString())
                 "lineView".setDefaultValue(binding.objectInclude.lineView.text.toString())
                 "roadView".setDefaultValue(binding.objectInclude.roadView.text.toString())
@@ -1078,11 +1127,11 @@
             binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
 
             //设置默认值
-            binding.objectInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
-            binding.objectInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
-            binding.objectInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
-            binding.objectInclude.downPipeDiameterView.setText("downPipeDiameterView".getDefaultValue())
-            binding.objectInclude.downPointDeepView.setText("downPointDeepView".getDefaultValue())
+            binding.objectInclude.pipeInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
+            binding.objectInclude.pipeInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
+            binding.objectInclude.pipeInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.setText("bottomPipeDiameterView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPointDeepView.setText("bottomPointDeepView".getDefaultValue())
             binding.objectInclude.areaView.setText("areaView".getDefaultValue())
             binding.objectInclude.lineView.setText("lineView".getDefaultValue())
             binding.objectInclude.roadView.setText("roadView".getDefaultValue())
@@ -1094,16 +1143,28 @@
             binding.objectInclude.objectTypeSpinner.show(
                 this@MainActivity, LocaleConstant.POINT_TYPE_ARRAY, 0
             )
-            binding.objectInclude.materialSpinner.show(
+            binding.objectInclude.pipeInclude.materialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.downPipeTypeSpinner.show(
-                this@MainActivity, LocaleConstant.DOWN_PIPE_TYPE_ARRAY, 0
+            binding.objectInclude.pipeAttachInclude.attachSpinner.show(
+                this@MainActivity, LocaleConstant.ATTACH_NAME_ARRAY, 0
             )
-            binding.objectInclude.downPipeMaterialSpinner.show(
+            binding.objectInclude.pipeFeatureInclude.featureSpinner.show(
+                this@MainActivity, LocaleConstant.FEATURE_NAME_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeMaterialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.buryMethodSpinner.show(
+            binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
+            )
+            binding.objectInclude.pipeInclude.buryTypeSpinner.show(
                 this@MainActivity, LocaleConstant.BURY_METHOD_ARRAY, 0
             )
 
@@ -1183,17 +1244,23 @@
 
             val labelBean = LabelBean()
             labelBean.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString()
-            labelBean.pipelineType = binding.objectInclude.markerObjectTypeView.text.toString()
+            labelBean.pipelineType =
+                binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString()
             labelBean.pipelineMaterial =
-                binding.objectInclude.materialSpinner.selectedItem.toString()
-            labelBean.pipelineDiameter = "${binding.objectInclude.pipelineDiameterView.text}mm"
-            labelBean.buryDeep = "${binding.objectInclude.buryDeepView.text}mm"
-            labelBean.lowerType = binding.objectInclude.downPipeTypeSpinner.selectedItem.toString()
+                binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString()
+            labelBean.pipelineDiameter =
+                "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm"
+            labelBean.buryDeep = "${binding.objectInclude.pipeInclude.buryDeepView.text}mm"
+            labelBean.lowerType =
+                binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString()
             labelBean.lowerMaterial =
-                binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString()
-            labelBean.lowerDiameter = "${binding.objectInclude.downPipeDiameterView.text}mm"
-            labelBean.lowerDeep = "${binding.objectInclude.downPointDeepView.text}mm"
-            labelBean.buryMethod = binding.objectInclude.buryMethodSpinner.selectedItem.toString()
+                binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString()
+            labelBean.lowerDiameter =
+                "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm"
+            labelBean.lowerDeep =
+                "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm"
+            labelBean.buryMethod =
+                binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString()
             labelBean.area = binding.objectInclude.areaView.text.toString()
             labelBean.line = binding.objectInclude.lineView.text.toString()
             labelBean.road = binding.objectInclude.roadView.text.toString()

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index 0e95a77..7637aaf 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -42,7 +42,13 @@
         "备注"
     )
     var PIPE_MATERIAL_ARRAY = arrayOf("铸铁", "塑料")
-    var DOWN_PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
+    var ATTACH_NAME_ARRAY = arrayOf("管井", "阀门", "管堵", "阀门井")
+    var FEATURE_NAME_ARRAY = arrayOf(
+        "转折点", "变径点", "三通", "四通", "套管", "大小头",
+        "弯头", "预留端口", "绝缘接头", "腐蚀抢修", "外界破坏抢修", "高程变化", "穿河流两端",
+        "密封端头（盲板）", "绝缘接头", "塑钢转换", "顶管", "牺牲阳极", "变坡"
+    )
+    var PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
     var BURY_METHOD_ARRAY = arrayOf("直埋", "圆管", "管块", "管沟", "架空")
     var IDENTIFIER_TYPE_ARRAY = arrayOf("EM30", "EM50", "EM14")
     var COLOR_ARRAY = arrayOf("蓝色", "橙色", "红色", "黑色", "紫色", "黄色", "绿色")
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index bb448fe..ec2c6a9 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -18,6 +18,7 @@
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.RotateAnimation
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.amap.api.location.AMapLocation
@@ -896,11 +897,59 @@
                 dismiss()
             }
 
+            binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                    ) {
+                        when (position) {
+                            0 -> {
+                                //显示管线属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.VISIBLE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                //显示管线附属物属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            2 -> {
+                                //显示管线特征点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            3 -> {
+                                //显示交叉穿越点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility =
+                                    View.VISIBLE
+                            }
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {
+
+                    }
+                }
+
             //安装
             binding.installButton.setOnClickListener {
                 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") as String
                 val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String
-                if (binding.objectInclude.markerObjectTypeView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.markerObjectTypeView.text.isNullOrBlank()) {
                     when (binding.objectInclude.objectTypeSpinner.selectedItem.toString()) {
                         "管线" -> "请输入管线种类！".show(context)
                         "管线附属物" -> "请输入附属物名称！".show(context)
@@ -910,17 +959,17 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
                     "请输入管径".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.buryDeepView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
                     "请输入埋深".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.downPipeDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
                     "请输入下层管管径".show(context)
                     return@setOnClickListener
                 }
@@ -972,15 +1021,15 @@
                 taskViewModel.installLabel(
                     companyId,
                     binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(),
-                    binding.objectInclude.markerObjectTypeView.text.toString(),
-                    binding.objectInclude.materialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.pipelineDiameterView.text}mm",
-                    "${binding.objectInclude.buryDeepView.text}mm",
-                    binding.objectInclude.downPipeTypeSpinner.selectedItem.toString(),
-                    binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.downPipeDiameterView.text}mm",
-                    "${binding.objectInclude.downPointDeepView.text}mm",
-                    binding.objectInclude.buryMethodSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(),
+                    binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm",
+                    "${binding.objectInclude.pipeInclude.buryDeepView.text}mm",
+                    binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm",
+                    "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm",
+                    binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString(),
                     binding.objectInclude.areaView.text.toString(),
                     binding.objectInclude.lineView.text.toString(),
                     binding.objectInclude.roadView.text.toString(),
@@ -1000,11 +1049,11 @@
                 )
 
                 //保存默认值
-                "markerObjectTypeView".setDefaultValue(binding.objectInclude.markerObjectTypeView.text.toString())
-                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipelineDiameterView.text.toString())
-                "buryDeepView".setDefaultValue(binding.objectInclude.buryDeepView.text.toString())
-                "downPipeDiameterView".setDefaultValue(binding.objectInclude.downPipeDiameterView.text.toString())
-                "downPointDeepView".setDefaultValue(binding.objectInclude.downPointDeepView.text.toString())
+                "markerObjectTypeView".setDefaultValue(binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString())
+                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipeInclude.pipelineDiameterView.text.toString())
+                "buryDeepView".setDefaultValue(binding.objectInclude.pipeInclude.buryDeepView.text.toString())
+                "bottomPipeDiameterView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.toString())
+                "bottomPointDeepView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text.toString())
                 "areaView".setDefaultValue(binding.objectInclude.areaView.text.toString())
                 "lineView".setDefaultValue(binding.objectInclude.lineView.text.toString())
                 "roadView".setDefaultValue(binding.objectInclude.roadView.text.toString())
@@ -1078,11 +1127,11 @@
             binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
 
             //设置默认值
-            binding.objectInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
-            binding.objectInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
-            binding.objectInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
-            binding.objectInclude.downPipeDiameterView.setText("downPipeDiameterView".getDefaultValue())
-            binding.objectInclude.downPointDeepView.setText("downPointDeepView".getDefaultValue())
+            binding.objectInclude.pipeInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
+            binding.objectInclude.pipeInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
+            binding.objectInclude.pipeInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.setText("bottomPipeDiameterView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPointDeepView.setText("bottomPointDeepView".getDefaultValue())
             binding.objectInclude.areaView.setText("areaView".getDefaultValue())
             binding.objectInclude.lineView.setText("lineView".getDefaultValue())
             binding.objectInclude.roadView.setText("roadView".getDefaultValue())
@@ -1094,16 +1143,28 @@
             binding.objectInclude.objectTypeSpinner.show(
                 this@MainActivity, LocaleConstant.POINT_TYPE_ARRAY, 0
             )
-            binding.objectInclude.materialSpinner.show(
+            binding.objectInclude.pipeInclude.materialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.downPipeTypeSpinner.show(
-                this@MainActivity, LocaleConstant.DOWN_PIPE_TYPE_ARRAY, 0
+            binding.objectInclude.pipeAttachInclude.attachSpinner.show(
+                this@MainActivity, LocaleConstant.ATTACH_NAME_ARRAY, 0
             )
-            binding.objectInclude.downPipeMaterialSpinner.show(
+            binding.objectInclude.pipeFeatureInclude.featureSpinner.show(
+                this@MainActivity, LocaleConstant.FEATURE_NAME_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeMaterialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.buryMethodSpinner.show(
+            binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
+            )
+            binding.objectInclude.pipeInclude.buryTypeSpinner.show(
                 this@MainActivity, LocaleConstant.BURY_METHOD_ARRAY, 0
             )
 
@@ -1183,17 +1244,23 @@
 
             val labelBean = LabelBean()
             labelBean.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString()
-            labelBean.pipelineType = binding.objectInclude.markerObjectTypeView.text.toString()
+            labelBean.pipelineType =
+                binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString()
             labelBean.pipelineMaterial =
-                binding.objectInclude.materialSpinner.selectedItem.toString()
-            labelBean.pipelineDiameter = "${binding.objectInclude.pipelineDiameterView.text}mm"
-            labelBean.buryDeep = "${binding.objectInclude.buryDeepView.text}mm"
-            labelBean.lowerType = binding.objectInclude.downPipeTypeSpinner.selectedItem.toString()
+                binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString()
+            labelBean.pipelineDiameter =
+                "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm"
+            labelBean.buryDeep = "${binding.objectInclude.pipeInclude.buryDeepView.text}mm"
+            labelBean.lowerType =
+                binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString()
             labelBean.lowerMaterial =
-                binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString()
-            labelBean.lowerDiameter = "${binding.objectInclude.downPipeDiameterView.text}mm"
-            labelBean.lowerDeep = "${binding.objectInclude.downPointDeepView.text}mm"
-            labelBean.buryMethod = binding.objectInclude.buryMethodSpinner.selectedItem.toString()
+                binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString()
+            labelBean.lowerDiameter =
+                "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm"
+            labelBean.lowerDeep =
+                "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm"
+            labelBean.buryMethod =
+                binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString()
             labelBean.area = binding.objectInclude.areaView.text.toString()
             labelBean.line = binding.objectInclude.lineView.text.toString()
             labelBean.road = binding.objectInclude.roadView.text.toString()
diff --git a/app/src/main/res/layout/include_install_label_object.xml b/app/src/main/res/layout/include_install_label_object.xml
index c974a52..8f80437 100644
--- a/app/src/main/res/layout/include_install_label_object.xml
+++ b/app/src/main/res/layout/include_install_label_object.xml
@@ -41,210 +41,24 @@
             style="@style/spinnerStyle" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/pointTypeLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+    <include
+        android:id="@+id/pipeInclude"
+        layout="@layout/include_pipeline" />
 
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
+    <include
+        android:id="@+id/pipeAttachInclude"
+        layout="@layout/include_pipeline_attachment"
+        android:visibility="gone" />
 
-        <TextView
-            style="@style/textViewStyle"
-            android:text="类型：" />
+    <include
+        android:id="@+id/pipeFeatureInclude"
+        layout="@layout/include_pipeline_feature"
+        android:visibility="gone" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/markerObjectTypeView"
-            style="@style/inputEditTextStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/pointMaterialLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管材：" />
-
-        <Spinner
-            android:id="@+id/materialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/pipelineDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/buryDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管种类：" />
-
-        <Spinner
-            android:id="@+id/downPipeTypeSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管材料：" />
-
-        <Spinner
-            android:id="@+id/downPipeMaterialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管直径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPipeDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPointDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋设方式：" />
-
-        <Spinner
-            android:id="@+id/buryMethodSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
+    <include
+        android:id="@+id/pipeCrossInclude"
+        layout="@layout/include_pipeline_cross"
+        android:visibility="gone" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index 0e95a77..7637aaf 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -42,7 +42,13 @@
         "备注"
     )
     var PIPE_MATERIAL_ARRAY = arrayOf("铸铁", "塑料")
-    var DOWN_PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
+    var ATTACH_NAME_ARRAY = arrayOf("管井", "阀门", "管堵", "阀门井")
+    var FEATURE_NAME_ARRAY = arrayOf(
+        "转折点", "变径点", "三通", "四通", "套管", "大小头",
+        "弯头", "预留端口", "绝缘接头", "腐蚀抢修", "外界破坏抢修", "高程变化", "穿河流两端",
+        "密封端头（盲板）", "绝缘接头", "塑钢转换", "顶管", "牺牲阳极", "变坡"
+    )
+    var PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
     var BURY_METHOD_ARRAY = arrayOf("直埋", "圆管", "管块", "管沟", "架空")
     var IDENTIFIER_TYPE_ARRAY = arrayOf("EM30", "EM50", "EM14")
     var COLOR_ARRAY = arrayOf("蓝色", "橙色", "红色", "黑色", "紫色", "黄色", "绿色")
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index bb448fe..ec2c6a9 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -18,6 +18,7 @@
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.RotateAnimation
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.amap.api.location.AMapLocation
@@ -896,11 +897,59 @@
                 dismiss()
             }
 
+            binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                    ) {
+                        when (position) {
+                            0 -> {
+                                //显示管线属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.VISIBLE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                //显示管线附属物属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            2 -> {
+                                //显示管线特征点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            3 -> {
+                                //显示交叉穿越点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility =
+                                    View.VISIBLE
+                            }
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {
+
+                    }
+                }
+
             //安装
             binding.installButton.setOnClickListener {
                 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") as String
                 val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String
-                if (binding.objectInclude.markerObjectTypeView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.markerObjectTypeView.text.isNullOrBlank()) {
                     when (binding.objectInclude.objectTypeSpinner.selectedItem.toString()) {
                         "管线" -> "请输入管线种类！".show(context)
                         "管线附属物" -> "请输入附属物名称！".show(context)
@@ -910,17 +959,17 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
                     "请输入管径".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.buryDeepView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
                     "请输入埋深".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.downPipeDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
                     "请输入下层管管径".show(context)
                     return@setOnClickListener
                 }
@@ -972,15 +1021,15 @@
                 taskViewModel.installLabel(
                     companyId,
                     binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(),
-                    binding.objectInclude.markerObjectTypeView.text.toString(),
-                    binding.objectInclude.materialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.pipelineDiameterView.text}mm",
-                    "${binding.objectInclude.buryDeepView.text}mm",
-                    binding.objectInclude.downPipeTypeSpinner.selectedItem.toString(),
-                    binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.downPipeDiameterView.text}mm",
-                    "${binding.objectInclude.downPointDeepView.text}mm",
-                    binding.objectInclude.buryMethodSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(),
+                    binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm",
+                    "${binding.objectInclude.pipeInclude.buryDeepView.text}mm",
+                    binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm",
+                    "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm",
+                    binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString(),
                     binding.objectInclude.areaView.text.toString(),
                     binding.objectInclude.lineView.text.toString(),
                     binding.objectInclude.roadView.text.toString(),
@@ -1000,11 +1049,11 @@
                 )
 
                 //保存默认值
-                "markerObjectTypeView".setDefaultValue(binding.objectInclude.markerObjectTypeView.text.toString())
-                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipelineDiameterView.text.toString())
-                "buryDeepView".setDefaultValue(binding.objectInclude.buryDeepView.text.toString())
-                "downPipeDiameterView".setDefaultValue(binding.objectInclude.downPipeDiameterView.text.toString())
-                "downPointDeepView".setDefaultValue(binding.objectInclude.downPointDeepView.text.toString())
+                "markerObjectTypeView".setDefaultValue(binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString())
+                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipeInclude.pipelineDiameterView.text.toString())
+                "buryDeepView".setDefaultValue(binding.objectInclude.pipeInclude.buryDeepView.text.toString())
+                "bottomPipeDiameterView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.toString())
+                "bottomPointDeepView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text.toString())
                 "areaView".setDefaultValue(binding.objectInclude.areaView.text.toString())
                 "lineView".setDefaultValue(binding.objectInclude.lineView.text.toString())
                 "roadView".setDefaultValue(binding.objectInclude.roadView.text.toString())
@@ -1078,11 +1127,11 @@
             binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
 
             //设置默认值
-            binding.objectInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
-            binding.objectInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
-            binding.objectInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
-            binding.objectInclude.downPipeDiameterView.setText("downPipeDiameterView".getDefaultValue())
-            binding.objectInclude.downPointDeepView.setText("downPointDeepView".getDefaultValue())
+            binding.objectInclude.pipeInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
+            binding.objectInclude.pipeInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
+            binding.objectInclude.pipeInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.setText("bottomPipeDiameterView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPointDeepView.setText("bottomPointDeepView".getDefaultValue())
             binding.objectInclude.areaView.setText("areaView".getDefaultValue())
             binding.objectInclude.lineView.setText("lineView".getDefaultValue())
             binding.objectInclude.roadView.setText("roadView".getDefaultValue())
@@ -1094,16 +1143,28 @@
             binding.objectInclude.objectTypeSpinner.show(
                 this@MainActivity, LocaleConstant.POINT_TYPE_ARRAY, 0
             )
-            binding.objectInclude.materialSpinner.show(
+            binding.objectInclude.pipeInclude.materialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.downPipeTypeSpinner.show(
-                this@MainActivity, LocaleConstant.DOWN_PIPE_TYPE_ARRAY, 0
+            binding.objectInclude.pipeAttachInclude.attachSpinner.show(
+                this@MainActivity, LocaleConstant.ATTACH_NAME_ARRAY, 0
             )
-            binding.objectInclude.downPipeMaterialSpinner.show(
+            binding.objectInclude.pipeFeatureInclude.featureSpinner.show(
+                this@MainActivity, LocaleConstant.FEATURE_NAME_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeMaterialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.buryMethodSpinner.show(
+            binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
+            )
+            binding.objectInclude.pipeInclude.buryTypeSpinner.show(
                 this@MainActivity, LocaleConstant.BURY_METHOD_ARRAY, 0
             )
 
@@ -1183,17 +1244,23 @@
 
             val labelBean = LabelBean()
             labelBean.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString()
-            labelBean.pipelineType = binding.objectInclude.markerObjectTypeView.text.toString()
+            labelBean.pipelineType =
+                binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString()
             labelBean.pipelineMaterial =
-                binding.objectInclude.materialSpinner.selectedItem.toString()
-            labelBean.pipelineDiameter = "${binding.objectInclude.pipelineDiameterView.text}mm"
-            labelBean.buryDeep = "${binding.objectInclude.buryDeepView.text}mm"
-            labelBean.lowerType = binding.objectInclude.downPipeTypeSpinner.selectedItem.toString()
+                binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString()
+            labelBean.pipelineDiameter =
+                "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm"
+            labelBean.buryDeep = "${binding.objectInclude.pipeInclude.buryDeepView.text}mm"
+            labelBean.lowerType =
+                binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString()
             labelBean.lowerMaterial =
-                binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString()
-            labelBean.lowerDiameter = "${binding.objectInclude.downPipeDiameterView.text}mm"
-            labelBean.lowerDeep = "${binding.objectInclude.downPointDeepView.text}mm"
-            labelBean.buryMethod = binding.objectInclude.buryMethodSpinner.selectedItem.toString()
+                binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString()
+            labelBean.lowerDiameter =
+                "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm"
+            labelBean.lowerDeep =
+                "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm"
+            labelBean.buryMethod =
+                binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString()
             labelBean.area = binding.objectInclude.areaView.text.toString()
             labelBean.line = binding.objectInclude.lineView.text.toString()
             labelBean.road = binding.objectInclude.roadView.text.toString()
diff --git a/app/src/main/res/layout/include_install_label_object.xml b/app/src/main/res/layout/include_install_label_object.xml
index c974a52..8f80437 100644
--- a/app/src/main/res/layout/include_install_label_object.xml
+++ b/app/src/main/res/layout/include_install_label_object.xml
@@ -41,210 +41,24 @@
             style="@style/spinnerStyle" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/pointTypeLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+    <include
+        android:id="@+id/pipeInclude"
+        layout="@layout/include_pipeline" />
 
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
+    <include
+        android:id="@+id/pipeAttachInclude"
+        layout="@layout/include_pipeline_attachment"
+        android:visibility="gone" />
 
-        <TextView
-            style="@style/textViewStyle"
-            android:text="类型：" />
+    <include
+        android:id="@+id/pipeFeatureInclude"
+        layout="@layout/include_pipeline_feature"
+        android:visibility="gone" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/markerObjectTypeView"
-            style="@style/inputEditTextStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/pointMaterialLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管材：" />
-
-        <Spinner
-            android:id="@+id/materialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/pipelineDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/buryDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管种类：" />
-
-        <Spinner
-            android:id="@+id/downPipeTypeSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管材料：" />
-
-        <Spinner
-            android:id="@+id/downPipeMaterialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管直径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPipeDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPointDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋设方式：" />
-
-        <Spinner
-            android:id="@+id/buryMethodSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
+    <include
+        android:id="@+id/pipeCrossInclude"
+        layout="@layout/include_pipeline_cross"
+        android:visibility="gone" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_pipeline.xml b/app/src/main/res/layout/include_pipeline.xml
new file mode 100644
index 0000000..60de6d5
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/pointTypeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线种类：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/markerObjectTypeView"
+            style="@style/inputEditTextStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/pointMaterialLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线材质：" />
+
+        <Spinner
+            android:id="@+id/materialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/pipelineDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/buryDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="埋设方式：" />
+
+        <Spinner
+            android:id="@+id/buryTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index 0e95a77..7637aaf 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -42,7 +42,13 @@
         "备注"
     )
     var PIPE_MATERIAL_ARRAY = arrayOf("铸铁", "塑料")
-    var DOWN_PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
+    var ATTACH_NAME_ARRAY = arrayOf("管井", "阀门", "管堵", "阀门井")
+    var FEATURE_NAME_ARRAY = arrayOf(
+        "转折点", "变径点", "三通", "四通", "套管", "大小头",
+        "弯头", "预留端口", "绝缘接头", "腐蚀抢修", "外界破坏抢修", "高程变化", "穿河流两端",
+        "密封端头（盲板）", "绝缘接头", "塑钢转换", "顶管", "牺牲阳极", "变坡"
+    )
+    var PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
     var BURY_METHOD_ARRAY = arrayOf("直埋", "圆管", "管块", "管沟", "架空")
     var IDENTIFIER_TYPE_ARRAY = arrayOf("EM30", "EM50", "EM14")
     var COLOR_ARRAY = arrayOf("蓝色", "橙色", "红色", "黑色", "紫色", "黄色", "绿色")
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index bb448fe..ec2c6a9 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -18,6 +18,7 @@
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.RotateAnimation
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.amap.api.location.AMapLocation
@@ -896,11 +897,59 @@
                 dismiss()
             }
 
+            binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                    ) {
+                        when (position) {
+                            0 -> {
+                                //显示管线属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.VISIBLE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                //显示管线附属物属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            2 -> {
+                                //显示管线特征点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            3 -> {
+                                //显示交叉穿越点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility =
+                                    View.VISIBLE
+                            }
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {
+
+                    }
+                }
+
             //安装
             binding.installButton.setOnClickListener {
                 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") as String
                 val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String
-                if (binding.objectInclude.markerObjectTypeView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.markerObjectTypeView.text.isNullOrBlank()) {
                     when (binding.objectInclude.objectTypeSpinner.selectedItem.toString()) {
                         "管线" -> "请输入管线种类！".show(context)
                         "管线附属物" -> "请输入附属物名称！".show(context)
@@ -910,17 +959,17 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
                     "请输入管径".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.buryDeepView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
                     "请输入埋深".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.downPipeDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
                     "请输入下层管管径".show(context)
                     return@setOnClickListener
                 }
@@ -972,15 +1021,15 @@
                 taskViewModel.installLabel(
                     companyId,
                     binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(),
-                    binding.objectInclude.markerObjectTypeView.text.toString(),
-                    binding.objectInclude.materialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.pipelineDiameterView.text}mm",
-                    "${binding.objectInclude.buryDeepView.text}mm",
-                    binding.objectInclude.downPipeTypeSpinner.selectedItem.toString(),
-                    binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.downPipeDiameterView.text}mm",
-                    "${binding.objectInclude.downPointDeepView.text}mm",
-                    binding.objectInclude.buryMethodSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(),
+                    binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm",
+                    "${binding.objectInclude.pipeInclude.buryDeepView.text}mm",
+                    binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm",
+                    "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm",
+                    binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString(),
                     binding.objectInclude.areaView.text.toString(),
                     binding.objectInclude.lineView.text.toString(),
                     binding.objectInclude.roadView.text.toString(),
@@ -1000,11 +1049,11 @@
                 )
 
                 //保存默认值
-                "markerObjectTypeView".setDefaultValue(binding.objectInclude.markerObjectTypeView.text.toString())
-                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipelineDiameterView.text.toString())
-                "buryDeepView".setDefaultValue(binding.objectInclude.buryDeepView.text.toString())
-                "downPipeDiameterView".setDefaultValue(binding.objectInclude.downPipeDiameterView.text.toString())
-                "downPointDeepView".setDefaultValue(binding.objectInclude.downPointDeepView.text.toString())
+                "markerObjectTypeView".setDefaultValue(binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString())
+                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipeInclude.pipelineDiameterView.text.toString())
+                "buryDeepView".setDefaultValue(binding.objectInclude.pipeInclude.buryDeepView.text.toString())
+                "bottomPipeDiameterView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.toString())
+                "bottomPointDeepView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text.toString())
                 "areaView".setDefaultValue(binding.objectInclude.areaView.text.toString())
                 "lineView".setDefaultValue(binding.objectInclude.lineView.text.toString())
                 "roadView".setDefaultValue(binding.objectInclude.roadView.text.toString())
@@ -1078,11 +1127,11 @@
             binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
 
             //设置默认值
-            binding.objectInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
-            binding.objectInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
-            binding.objectInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
-            binding.objectInclude.downPipeDiameterView.setText("downPipeDiameterView".getDefaultValue())
-            binding.objectInclude.downPointDeepView.setText("downPointDeepView".getDefaultValue())
+            binding.objectInclude.pipeInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
+            binding.objectInclude.pipeInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
+            binding.objectInclude.pipeInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.setText("bottomPipeDiameterView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPointDeepView.setText("bottomPointDeepView".getDefaultValue())
             binding.objectInclude.areaView.setText("areaView".getDefaultValue())
             binding.objectInclude.lineView.setText("lineView".getDefaultValue())
             binding.objectInclude.roadView.setText("roadView".getDefaultValue())
@@ -1094,16 +1143,28 @@
             binding.objectInclude.objectTypeSpinner.show(
                 this@MainActivity, LocaleConstant.POINT_TYPE_ARRAY, 0
             )
-            binding.objectInclude.materialSpinner.show(
+            binding.objectInclude.pipeInclude.materialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.downPipeTypeSpinner.show(
-                this@MainActivity, LocaleConstant.DOWN_PIPE_TYPE_ARRAY, 0
+            binding.objectInclude.pipeAttachInclude.attachSpinner.show(
+                this@MainActivity, LocaleConstant.ATTACH_NAME_ARRAY, 0
             )
-            binding.objectInclude.downPipeMaterialSpinner.show(
+            binding.objectInclude.pipeFeatureInclude.featureSpinner.show(
+                this@MainActivity, LocaleConstant.FEATURE_NAME_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeMaterialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.buryMethodSpinner.show(
+            binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
+            )
+            binding.objectInclude.pipeInclude.buryTypeSpinner.show(
                 this@MainActivity, LocaleConstant.BURY_METHOD_ARRAY, 0
             )
 
@@ -1183,17 +1244,23 @@
 
             val labelBean = LabelBean()
             labelBean.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString()
-            labelBean.pipelineType = binding.objectInclude.markerObjectTypeView.text.toString()
+            labelBean.pipelineType =
+                binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString()
             labelBean.pipelineMaterial =
-                binding.objectInclude.materialSpinner.selectedItem.toString()
-            labelBean.pipelineDiameter = "${binding.objectInclude.pipelineDiameterView.text}mm"
-            labelBean.buryDeep = "${binding.objectInclude.buryDeepView.text}mm"
-            labelBean.lowerType = binding.objectInclude.downPipeTypeSpinner.selectedItem.toString()
+                binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString()
+            labelBean.pipelineDiameter =
+                "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm"
+            labelBean.buryDeep = "${binding.objectInclude.pipeInclude.buryDeepView.text}mm"
+            labelBean.lowerType =
+                binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString()
             labelBean.lowerMaterial =
-                binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString()
-            labelBean.lowerDiameter = "${binding.objectInclude.downPipeDiameterView.text}mm"
-            labelBean.lowerDeep = "${binding.objectInclude.downPointDeepView.text}mm"
-            labelBean.buryMethod = binding.objectInclude.buryMethodSpinner.selectedItem.toString()
+                binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString()
+            labelBean.lowerDiameter =
+                "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm"
+            labelBean.lowerDeep =
+                "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm"
+            labelBean.buryMethod =
+                binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString()
             labelBean.area = binding.objectInclude.areaView.text.toString()
             labelBean.line = binding.objectInclude.lineView.text.toString()
             labelBean.road = binding.objectInclude.roadView.text.toString()
diff --git a/app/src/main/res/layout/include_install_label_object.xml b/app/src/main/res/layout/include_install_label_object.xml
index c974a52..8f80437 100644
--- a/app/src/main/res/layout/include_install_label_object.xml
+++ b/app/src/main/res/layout/include_install_label_object.xml
@@ -41,210 +41,24 @@
             style="@style/spinnerStyle" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/pointTypeLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+    <include
+        android:id="@+id/pipeInclude"
+        layout="@layout/include_pipeline" />
 
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
+    <include
+        android:id="@+id/pipeAttachInclude"
+        layout="@layout/include_pipeline_attachment"
+        android:visibility="gone" />
 
-        <TextView
-            style="@style/textViewStyle"
-            android:text="类型：" />
+    <include
+        android:id="@+id/pipeFeatureInclude"
+        layout="@layout/include_pipeline_feature"
+        android:visibility="gone" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/markerObjectTypeView"
-            style="@style/inputEditTextStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/pointMaterialLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管材：" />
-
-        <Spinner
-            android:id="@+id/materialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/pipelineDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/buryDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管种类：" />
-
-        <Spinner
-            android:id="@+id/downPipeTypeSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管材料：" />
-
-        <Spinner
-            android:id="@+id/downPipeMaterialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管直径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPipeDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPointDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋设方式：" />
-
-        <Spinner
-            android:id="@+id/buryMethodSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
+    <include
+        android:id="@+id/pipeCrossInclude"
+        layout="@layout/include_pipeline_cross"
+        android:visibility="gone" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_pipeline.xml b/app/src/main/res/layout/include_pipeline.xml
new file mode 100644
index 0000000..60de6d5
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/pointTypeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线种类：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/markerObjectTypeView"
+            style="@style/inputEditTextStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/pointMaterialLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线材质：" />
+
+        <Spinner
+            android:id="@+id/materialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/pipelineDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/buryDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="埋设方式：" />
+
+        <Spinner
+            android:id="@+id/buryTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_pipeline_attachment.xml b/app/src/main/res/layout/include_pipeline_attachment.xml
new file mode 100644
index 0000000..59e46ba
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline_attachment.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="附属物名称：" />
+
+        <Spinner
+            android:id="@+id/attachSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="井深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/wellDepthView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index 0e95a77..7637aaf 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -42,7 +42,13 @@
         "备注"
     )
     var PIPE_MATERIAL_ARRAY = arrayOf("铸铁", "塑料")
-    var DOWN_PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
+    var ATTACH_NAME_ARRAY = arrayOf("管井", "阀门", "管堵", "阀门井")
+    var FEATURE_NAME_ARRAY = arrayOf(
+        "转折点", "变径点", "三通", "四通", "套管", "大小头",
+        "弯头", "预留端口", "绝缘接头", "腐蚀抢修", "外界破坏抢修", "高程变化", "穿河流两端",
+        "密封端头（盲板）", "绝缘接头", "塑钢转换", "顶管", "牺牲阳极", "变坡"
+    )
+    var PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
     var BURY_METHOD_ARRAY = arrayOf("直埋", "圆管", "管块", "管沟", "架空")
     var IDENTIFIER_TYPE_ARRAY = arrayOf("EM30", "EM50", "EM14")
     var COLOR_ARRAY = arrayOf("蓝色", "橙色", "红色", "黑色", "紫色", "黄色", "绿色")
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index bb448fe..ec2c6a9 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -18,6 +18,7 @@
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.RotateAnimation
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.amap.api.location.AMapLocation
@@ -896,11 +897,59 @@
                 dismiss()
             }
 
+            binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                    ) {
+                        when (position) {
+                            0 -> {
+                                //显示管线属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.VISIBLE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                //显示管线附属物属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            2 -> {
+                                //显示管线特征点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            3 -> {
+                                //显示交叉穿越点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility =
+                                    View.VISIBLE
+                            }
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {
+
+                    }
+                }
+
             //安装
             binding.installButton.setOnClickListener {
                 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") as String
                 val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String
-                if (binding.objectInclude.markerObjectTypeView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.markerObjectTypeView.text.isNullOrBlank()) {
                     when (binding.objectInclude.objectTypeSpinner.selectedItem.toString()) {
                         "管线" -> "请输入管线种类！".show(context)
                         "管线附属物" -> "请输入附属物名称！".show(context)
@@ -910,17 +959,17 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
                     "请输入管径".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.buryDeepView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
                     "请输入埋深".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.downPipeDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
                     "请输入下层管管径".show(context)
                     return@setOnClickListener
                 }
@@ -972,15 +1021,15 @@
                 taskViewModel.installLabel(
                     companyId,
                     binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(),
-                    binding.objectInclude.markerObjectTypeView.text.toString(),
-                    binding.objectInclude.materialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.pipelineDiameterView.text}mm",
-                    "${binding.objectInclude.buryDeepView.text}mm",
-                    binding.objectInclude.downPipeTypeSpinner.selectedItem.toString(),
-                    binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.downPipeDiameterView.text}mm",
-                    "${binding.objectInclude.downPointDeepView.text}mm",
-                    binding.objectInclude.buryMethodSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(),
+                    binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm",
+                    "${binding.objectInclude.pipeInclude.buryDeepView.text}mm",
+                    binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm",
+                    "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm",
+                    binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString(),
                     binding.objectInclude.areaView.text.toString(),
                     binding.objectInclude.lineView.text.toString(),
                     binding.objectInclude.roadView.text.toString(),
@@ -1000,11 +1049,11 @@
                 )
 
                 //保存默认值
-                "markerObjectTypeView".setDefaultValue(binding.objectInclude.markerObjectTypeView.text.toString())
-                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipelineDiameterView.text.toString())
-                "buryDeepView".setDefaultValue(binding.objectInclude.buryDeepView.text.toString())
-                "downPipeDiameterView".setDefaultValue(binding.objectInclude.downPipeDiameterView.text.toString())
-                "downPointDeepView".setDefaultValue(binding.objectInclude.downPointDeepView.text.toString())
+                "markerObjectTypeView".setDefaultValue(binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString())
+                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipeInclude.pipelineDiameterView.text.toString())
+                "buryDeepView".setDefaultValue(binding.objectInclude.pipeInclude.buryDeepView.text.toString())
+                "bottomPipeDiameterView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.toString())
+                "bottomPointDeepView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text.toString())
                 "areaView".setDefaultValue(binding.objectInclude.areaView.text.toString())
                 "lineView".setDefaultValue(binding.objectInclude.lineView.text.toString())
                 "roadView".setDefaultValue(binding.objectInclude.roadView.text.toString())
@@ -1078,11 +1127,11 @@
             binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
 
             //设置默认值
-            binding.objectInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
-            binding.objectInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
-            binding.objectInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
-            binding.objectInclude.downPipeDiameterView.setText("downPipeDiameterView".getDefaultValue())
-            binding.objectInclude.downPointDeepView.setText("downPointDeepView".getDefaultValue())
+            binding.objectInclude.pipeInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
+            binding.objectInclude.pipeInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
+            binding.objectInclude.pipeInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.setText("bottomPipeDiameterView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPointDeepView.setText("bottomPointDeepView".getDefaultValue())
             binding.objectInclude.areaView.setText("areaView".getDefaultValue())
             binding.objectInclude.lineView.setText("lineView".getDefaultValue())
             binding.objectInclude.roadView.setText("roadView".getDefaultValue())
@@ -1094,16 +1143,28 @@
             binding.objectInclude.objectTypeSpinner.show(
                 this@MainActivity, LocaleConstant.POINT_TYPE_ARRAY, 0
             )
-            binding.objectInclude.materialSpinner.show(
+            binding.objectInclude.pipeInclude.materialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.downPipeTypeSpinner.show(
-                this@MainActivity, LocaleConstant.DOWN_PIPE_TYPE_ARRAY, 0
+            binding.objectInclude.pipeAttachInclude.attachSpinner.show(
+                this@MainActivity, LocaleConstant.ATTACH_NAME_ARRAY, 0
             )
-            binding.objectInclude.downPipeMaterialSpinner.show(
+            binding.objectInclude.pipeFeatureInclude.featureSpinner.show(
+                this@MainActivity, LocaleConstant.FEATURE_NAME_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeMaterialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.buryMethodSpinner.show(
+            binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
+            )
+            binding.objectInclude.pipeInclude.buryTypeSpinner.show(
                 this@MainActivity, LocaleConstant.BURY_METHOD_ARRAY, 0
             )
 
@@ -1183,17 +1244,23 @@
 
             val labelBean = LabelBean()
             labelBean.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString()
-            labelBean.pipelineType = binding.objectInclude.markerObjectTypeView.text.toString()
+            labelBean.pipelineType =
+                binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString()
             labelBean.pipelineMaterial =
-                binding.objectInclude.materialSpinner.selectedItem.toString()
-            labelBean.pipelineDiameter = "${binding.objectInclude.pipelineDiameterView.text}mm"
-            labelBean.buryDeep = "${binding.objectInclude.buryDeepView.text}mm"
-            labelBean.lowerType = binding.objectInclude.downPipeTypeSpinner.selectedItem.toString()
+                binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString()
+            labelBean.pipelineDiameter =
+                "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm"
+            labelBean.buryDeep = "${binding.objectInclude.pipeInclude.buryDeepView.text}mm"
+            labelBean.lowerType =
+                binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString()
             labelBean.lowerMaterial =
-                binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString()
-            labelBean.lowerDiameter = "${binding.objectInclude.downPipeDiameterView.text}mm"
-            labelBean.lowerDeep = "${binding.objectInclude.downPointDeepView.text}mm"
-            labelBean.buryMethod = binding.objectInclude.buryMethodSpinner.selectedItem.toString()
+                binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString()
+            labelBean.lowerDiameter =
+                "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm"
+            labelBean.lowerDeep =
+                "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm"
+            labelBean.buryMethod =
+                binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString()
             labelBean.area = binding.objectInclude.areaView.text.toString()
             labelBean.line = binding.objectInclude.lineView.text.toString()
             labelBean.road = binding.objectInclude.roadView.text.toString()
diff --git a/app/src/main/res/layout/include_install_label_object.xml b/app/src/main/res/layout/include_install_label_object.xml
index c974a52..8f80437 100644
--- a/app/src/main/res/layout/include_install_label_object.xml
+++ b/app/src/main/res/layout/include_install_label_object.xml
@@ -41,210 +41,24 @@
             style="@style/spinnerStyle" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/pointTypeLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+    <include
+        android:id="@+id/pipeInclude"
+        layout="@layout/include_pipeline" />
 
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
+    <include
+        android:id="@+id/pipeAttachInclude"
+        layout="@layout/include_pipeline_attachment"
+        android:visibility="gone" />
 
-        <TextView
-            style="@style/textViewStyle"
-            android:text="类型：" />
+    <include
+        android:id="@+id/pipeFeatureInclude"
+        layout="@layout/include_pipeline_feature"
+        android:visibility="gone" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/markerObjectTypeView"
-            style="@style/inputEditTextStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/pointMaterialLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管材：" />
-
-        <Spinner
-            android:id="@+id/materialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/pipelineDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/buryDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管种类：" />
-
-        <Spinner
-            android:id="@+id/downPipeTypeSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管材料：" />
-
-        <Spinner
-            android:id="@+id/downPipeMaterialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管直径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPipeDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPointDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋设方式：" />
-
-        <Spinner
-            android:id="@+id/buryMethodSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
+    <include
+        android:id="@+id/pipeCrossInclude"
+        layout="@layout/include_pipeline_cross"
+        android:visibility="gone" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_pipeline.xml b/app/src/main/res/layout/include_pipeline.xml
new file mode 100644
index 0000000..60de6d5
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/pointTypeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线种类：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/markerObjectTypeView"
+            style="@style/inputEditTextStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/pointMaterialLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线材质：" />
+
+        <Spinner
+            android:id="@+id/materialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/pipelineDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/buryDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="埋设方式：" />
+
+        <Spinner
+            android:id="@+id/buryTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_pipeline_attachment.xml b/app/src/main/res/layout/include_pipeline_attachment.xml
new file mode 100644
index 0000000..59e46ba
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline_attachment.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="附属物名称：" />
+
+        <Spinner
+            android:id="@+id/attachSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="井深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/wellDepthView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_pipeline_cross.xml b/app/src/main/res/layout/include_pipeline_cross.xml
new file mode 100644
index 0000000..5fd10bf
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline_cross.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管种类：" />
+
+        <Spinner
+            android:id="@+id/topPipeTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管材料：" />
+
+        <Spinner
+            android:id="@+id/topPipeMaterialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/topPipeDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/topPointDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管种类：" />
+
+        <Spinner
+            android:id="@+id/bottomPipeTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管材料：" />
+
+        <Spinner
+            android:id="@+id/bottomPipeMaterialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/bottomPipeDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/bottomPointDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
index 0e95a77..7637aaf 100644
--- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt
@@ -42,7 +42,13 @@
         "备注"
     )
     var PIPE_MATERIAL_ARRAY = arrayOf("铸铁", "塑料")
-    var DOWN_PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
+    var ATTACH_NAME_ARRAY = arrayOf("管井", "阀门", "管堵", "阀门井")
+    var FEATURE_NAME_ARRAY = arrayOf(
+        "转折点", "变径点", "三通", "四通", "套管", "大小头",
+        "弯头", "预留端口", "绝缘接头", "腐蚀抢修", "外界破坏抢修", "高程变化", "穿河流两端",
+        "密封端头（盲板）", "绝缘接头", "塑钢转换", "顶管", "牺牲阳极", "变坡"
+    )
+    var PIPE_TYPE_ARRAY = arrayOf("热力", "燃气", "供水", "电力", "通信")
     var BURY_METHOD_ARRAY = arrayOf("直埋", "圆管", "管块", "管沟", "架空")
     var IDENTIFIER_TYPE_ARRAY = arrayOf("EM30", "EM50", "EM14")
     var COLOR_ARRAY = arrayOf("蓝色", "橙色", "红色", "黑色", "紫色", "黄色", "绿色")
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index bb448fe..ec2c6a9 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -18,6 +18,7 @@
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.RotateAnimation
+import android.widget.AdapterView
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.amap.api.location.AMapLocation
@@ -896,11 +897,59 @@
                 dismiss()
             }
 
+            binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                    ) {
+                        when (position) {
+                            0 -> {
+                                //显示管线属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.VISIBLE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            1 -> {
+                                //显示管线附属物属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            2 -> {
+                                //显示管线特征点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility =
+                                    View.VISIBLE
+                                binding.objectInclude.pipeCrossInclude.root.visibility = View.GONE
+                            }
+
+                            3 -> {
+                                //显示交叉穿越点属性
+                                binding.objectInclude.pipeInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeAttachInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeFeatureInclude.root.visibility = View.GONE
+                                binding.objectInclude.pipeCrossInclude.root.visibility =
+                                    View.VISIBLE
+                            }
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>?) {
+
+                    }
+                }
+
             //安装
             binding.installButton.setOnClickListener {
                 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") as String
                 val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String
-                if (binding.objectInclude.markerObjectTypeView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.markerObjectTypeView.text.isNullOrBlank()) {
                     when (binding.objectInclude.objectTypeSpinner.selectedItem.toString()) {
                         "管线" -> "请输入管线种类！".show(context)
                         "管线附属物" -> "请输入附属物名称！".show(context)
@@ -910,17 +959,17 @@
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.pipelineDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.pipelineDiameterView.text.isNullOrBlank()) {
                     "请输入管径".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.buryDeepView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeInclude.buryDeepView.text.isNullOrBlank()) {
                     "请输入埋深".show(context)
                     return@setOnClickListener
                 }
 
-                if (binding.objectInclude.downPipeDiameterView.text.isNullOrBlank()) {
+                if (binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.isNullOrBlank()) {
                     "请输入下层管管径".show(context)
                     return@setOnClickListener
                 }
@@ -972,15 +1021,15 @@
                 taskViewModel.installLabel(
                     companyId,
                     binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(),
-                    binding.objectInclude.markerObjectTypeView.text.toString(),
-                    binding.objectInclude.materialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.pipelineDiameterView.text}mm",
-                    "${binding.objectInclude.buryDeepView.text}mm",
-                    binding.objectInclude.downPipeTypeSpinner.selectedItem.toString(),
-                    binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString(),
-                    "${binding.objectInclude.downPipeDiameterView.text}mm",
-                    "${binding.objectInclude.downPointDeepView.text}mm",
-                    binding.objectInclude.buryMethodSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(),
+                    binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm",
+                    "${binding.objectInclude.pipeInclude.buryDeepView.text}mm",
+                    binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString(),
+                    binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString(),
+                    "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm",
+                    "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm",
+                    binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString(),
                     binding.objectInclude.areaView.text.toString(),
                     binding.objectInclude.lineView.text.toString(),
                     binding.objectInclude.roadView.text.toString(),
@@ -1000,11 +1049,11 @@
                 )
 
                 //保存默认值
-                "markerObjectTypeView".setDefaultValue(binding.objectInclude.markerObjectTypeView.text.toString())
-                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipelineDiameterView.text.toString())
-                "buryDeepView".setDefaultValue(binding.objectInclude.buryDeepView.text.toString())
-                "downPipeDiameterView".setDefaultValue(binding.objectInclude.downPipeDiameterView.text.toString())
-                "downPointDeepView".setDefaultValue(binding.objectInclude.downPointDeepView.text.toString())
+                "markerObjectTypeView".setDefaultValue(binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString())
+                "pipelineDiameterView".setDefaultValue(binding.objectInclude.pipeInclude.pipelineDiameterView.text.toString())
+                "buryDeepView".setDefaultValue(binding.objectInclude.pipeInclude.buryDeepView.text.toString())
+                "bottomPipeDiameterView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text.toString())
+                "bottomPointDeepView".setDefaultValue(binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text.toString())
                 "areaView".setDefaultValue(binding.objectInclude.areaView.text.toString())
                 "lineView".setDefaultValue(binding.objectInclude.lineView.text.toString())
                 "roadView".setDefaultValue(binding.objectInclude.roadView.text.toString())
@@ -1078,11 +1127,11 @@
             binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
 
             //设置默认值
-            binding.objectInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
-            binding.objectInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
-            binding.objectInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
-            binding.objectInclude.downPipeDiameterView.setText("downPipeDiameterView".getDefaultValue())
-            binding.objectInclude.downPointDeepView.setText("downPointDeepView".getDefaultValue())
+            binding.objectInclude.pipeInclude.markerObjectTypeView.setText("markerObjectTypeView".getDefaultValue())
+            binding.objectInclude.pipeInclude.pipelineDiameterView.setText("pipelineDiameterView".getDefaultValue())
+            binding.objectInclude.pipeInclude.buryDeepView.setText("buryDeepView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.setText("bottomPipeDiameterView".getDefaultValue())
+            binding.objectInclude.pipeCrossInclude.bottomPointDeepView.setText("bottomPointDeepView".getDefaultValue())
             binding.objectInclude.areaView.setText("areaView".getDefaultValue())
             binding.objectInclude.lineView.setText("lineView".getDefaultValue())
             binding.objectInclude.roadView.setText("roadView".getDefaultValue())
@@ -1094,16 +1143,28 @@
             binding.objectInclude.objectTypeSpinner.show(
                 this@MainActivity, LocaleConstant.POINT_TYPE_ARRAY, 0
             )
-            binding.objectInclude.materialSpinner.show(
+            binding.objectInclude.pipeInclude.materialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.downPipeTypeSpinner.show(
-                this@MainActivity, LocaleConstant.DOWN_PIPE_TYPE_ARRAY, 0
+            binding.objectInclude.pipeAttachInclude.attachSpinner.show(
+                this@MainActivity, LocaleConstant.ATTACH_NAME_ARRAY, 0
             )
-            binding.objectInclude.downPipeMaterialSpinner.show(
+            binding.objectInclude.pipeFeatureInclude.featureSpinner.show(
+                this@MainActivity, LocaleConstant.FEATURE_NAME_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.topPipeMaterialSpinner.show(
                 this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
             )
-            binding.objectInclude.buryMethodSpinner.show(
+            binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_TYPE_ARRAY, 0
+            )
+            binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.show(
+                this@MainActivity, LocaleConstant.PIPE_MATERIAL_ARRAY, 0
+            )
+            binding.objectInclude.pipeInclude.buryTypeSpinner.show(
                 this@MainActivity, LocaleConstant.BURY_METHOD_ARRAY, 0
             )
 
@@ -1183,17 +1244,23 @@
 
             val labelBean = LabelBean()
             labelBean.objectType = binding.objectInclude.objectTypeSpinner.selectedItem.toString()
-            labelBean.pipelineType = binding.objectInclude.markerObjectTypeView.text.toString()
+            labelBean.pipelineType =
+                binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString()
             labelBean.pipelineMaterial =
-                binding.objectInclude.materialSpinner.selectedItem.toString()
-            labelBean.pipelineDiameter = "${binding.objectInclude.pipelineDiameterView.text}mm"
-            labelBean.buryDeep = "${binding.objectInclude.buryDeepView.text}mm"
-            labelBean.lowerType = binding.objectInclude.downPipeTypeSpinner.selectedItem.toString()
+                binding.objectInclude.pipeInclude.materialSpinner.selectedItem.toString()
+            labelBean.pipelineDiameter =
+                "${binding.objectInclude.pipeInclude.pipelineDiameterView.text}mm"
+            labelBean.buryDeep = "${binding.objectInclude.pipeInclude.buryDeepView.text}mm"
+            labelBean.lowerType =
+                binding.objectInclude.pipeCrossInclude.bottomPipeTypeSpinner.selectedItem.toString()
             labelBean.lowerMaterial =
-                binding.objectInclude.downPipeMaterialSpinner.selectedItem.toString()
-            labelBean.lowerDiameter = "${binding.objectInclude.downPipeDiameterView.text}mm"
-            labelBean.lowerDeep = "${binding.objectInclude.downPointDeepView.text}mm"
-            labelBean.buryMethod = binding.objectInclude.buryMethodSpinner.selectedItem.toString()
+                binding.objectInclude.pipeCrossInclude.bottomPipeMaterialSpinner.selectedItem.toString()
+            labelBean.lowerDiameter =
+                "${binding.objectInclude.pipeCrossInclude.bottomPipeDiameterView.text}mm"
+            labelBean.lowerDeep =
+                "${binding.objectInclude.pipeCrossInclude.bottomPointDeepView.text}mm"
+            labelBean.buryMethod =
+                binding.objectInclude.pipeInclude.buryTypeSpinner.selectedItem.toString()
             labelBean.area = binding.objectInclude.areaView.text.toString()
             labelBean.line = binding.objectInclude.lineView.text.toString()
             labelBean.road = binding.objectInclude.roadView.text.toString()
diff --git a/app/src/main/res/layout/include_install_label_object.xml b/app/src/main/res/layout/include_install_label_object.xml
index c974a52..8f80437 100644
--- a/app/src/main/res/layout/include_install_label_object.xml
+++ b/app/src/main/res/layout/include_install_label_object.xml
@@ -41,210 +41,24 @@
             style="@style/spinnerStyle" />
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/pointTypeLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+    <include
+        android:id="@+id/pipeInclude"
+        layout="@layout/include_pipeline" />
 
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
+    <include
+        android:id="@+id/pipeAttachInclude"
+        layout="@layout/include_pipeline_attachment"
+        android:visibility="gone" />
 
-        <TextView
-            style="@style/textViewStyle"
-            android:text="类型：" />
+    <include
+        android:id="@+id/pipeFeatureInclude"
+        layout="@layout/include_pipeline_feature"
+        android:visibility="gone" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/markerObjectTypeView"
-            style="@style/inputEditTextStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/pointMaterialLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管材：" />
-
-        <Spinner
-            android:id="@+id/materialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="管径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/pipelineDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/buryDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管种类：" />
-
-        <Spinner
-            android:id="@+id/downPipeTypeSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管材料：" />
-
-        <Spinner
-            android:id="@+id/downPipeMaterialSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管直径：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPipeDiameterView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="下层管埋深：" />
-
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/downPointDeepView"
-            style="@style/inputEditTextStyle"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_marginHorizontal="3dp"
-            android:text="mm"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            style="@style/leftImageStyle"
-            android:src="@mipmap/icon3" />
-
-        <TextView
-            style="@style/textViewStyle"
-            android:text="埋设方式：" />
-
-        <Spinner
-            android:id="@+id/buryMethodSpinner"
-            style="@style/spinnerStyle" />
-    </LinearLayout>
+    <include
+        android:id="@+id/pipeCrossInclude"
+        layout="@layout/include_pipeline_cross"
+        android:visibility="gone" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_pipeline.xml b/app/src/main/res/layout/include_pipeline.xml
new file mode 100644
index 0000000..60de6d5
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/pointTypeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线种类：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/markerObjectTypeView"
+            style="@style/inputEditTextStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/pointMaterialLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线材质：" />
+
+        <Spinner
+            android:id="@+id/materialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/pipelineDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="管线埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/buryDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="埋设方式：" />
+
+        <Spinner
+            android:id="@+id/buryTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_pipeline_attachment.xml b/app/src/main/res/layout/include_pipeline_attachment.xml
new file mode 100644
index 0000000..59e46ba
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline_attachment.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="附属物名称：" />
+
+        <Spinner
+            android:id="@+id/attachSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="井深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/wellDepthView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_pipeline_cross.xml b/app/src/main/res/layout/include_pipeline_cross.xml
new file mode 100644
index 0000000..5fd10bf
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline_cross.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管种类：" />
+
+        <Spinner
+            android:id="@+id/topPipeTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管材料：" />
+
+        <Spinner
+            android:id="@+id/topPipeMaterialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/topPipeDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="上层管埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/topPointDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管种类：" />
+
+        <Spinner
+            android:id="@+id/bottomPipeTypeSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管材料：" />
+
+        <Spinner
+            android:id="@+id/bottomPipeMaterialSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管直径：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/bottomPipeDiameterView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="下层管埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/bottomPointDeepView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_pipeline_feature.xml b/app/src/main/res/layout/include_pipeline_feature.xml
new file mode 100644
index 0000000..09253eb
--- /dev/null
+++ b/app/src/main/res/layout/include_pipeline_feature.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="特征管点：" />
+
+        <Spinner
+            android:id="@+id/featureSpinner"
+            style="@style/spinnerStyle" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            style="@style/leftImageStyle"
+            android:src="@mipmap/icon3" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:text="特征点埋深：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:id="@+id/featureDepthView"
+            style="@style/inputEditTextStyle"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            style="@style/textViewStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="3dp"
+            android:text="mm"
+            android:textSize="@dimen/sp_16" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file