diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index b7f6e36..09cbf8b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -23,8 +23,8 @@
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
 import kotlinx.android.synthetic.main.activity_select_customer.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCustomerActivity : ApplicationBaseActivity() {
 
@@ -69,7 +69,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (customerModel == null) {
                 "请选择委托方".show(this)
                 return@setOnClickListener

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index b7f6e36..09cbf8b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -23,8 +23,8 @@
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
 import kotlinx.android.synthetic.main.activity_select_customer.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCustomerActivity : ApplicationBaseActivity() {
 
@@ -69,7 +69,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (customerModel == null) {
                 "请选择委托方".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
index 6f276be..8bea6bb 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
@@ -18,8 +18,10 @@
 import com.pengxh.kt.lite.extensions.toJson
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.activity_select_sample.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectSampleActivity : ApplicationBaseActivity() {
 
@@ -63,7 +65,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             val intent = Intent()
             intent.putExtra("sampleModels", sampleModels.toJson())
             setResult(RESULT_OK, intent)

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index b7f6e36..09cbf8b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -23,8 +23,8 @@
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
 import kotlinx.android.synthetic.main.activity_select_customer.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCustomerActivity : ApplicationBaseActivity() {
 
@@ -69,7 +69,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (customerModel == null) {
                 "请选择委托方".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
index 6f276be..8bea6bb 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
@@ -18,8 +18,10 @@
 import com.pengxh.kt.lite.extensions.toJson
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.activity_select_sample.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectSampleActivity : ApplicationBaseActivity() {
 
@@ -63,7 +65,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             val intent = Intent()
             intent.putExtra("sampleModels", sampleModels.toJson())
             setResult(RESULT_OK, intent)
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index 0fd0721..2dea624 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -7,38 +7,7 @@
     android:background="@color/mainBackground"
     android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight">
-
-        <ImageView
-            android:id="@+id/leftBackView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:rotation="-180"
-            android:src="@drawable/ic_right_black" />
-
-        <TextView
-            android:id="@+id/titleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:fontFamily="sans-serif-medium"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="委托需求"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-
-        <ImageView
-            android:id="@+id/pushEntrustView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_selected" />
-    </RelativeLayout>
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index b7f6e36..09cbf8b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -23,8 +23,8 @@
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
 import kotlinx.android.synthetic.main.activity_select_customer.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCustomerActivity : ApplicationBaseActivity() {
 
@@ -69,7 +69,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (customerModel == null) {
                 "请选择委托方".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
index 6f276be..8bea6bb 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
@@ -18,8 +18,10 @@
 import com.pengxh.kt.lite.extensions.toJson
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.activity_select_sample.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectSampleActivity : ApplicationBaseActivity() {
 
@@ -63,7 +65,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             val intent = Intent()
             intent.putExtra("sampleModels", sampleModels.toJson())
             setResult(RESULT_OK, intent)
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index 0fd0721..2dea624 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -7,38 +7,7 @@
     android:background="@color/mainBackground"
     android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight">
-
-        <ImageView
-            android:id="@+id/leftBackView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:rotation="-180"
-            android:src="@drawable/ic_right_black" />
-
-        <TextView
-            android:id="@+id/titleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:fontFamily="sans-serif-medium"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="委托需求"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-
-        <ImageView
-            android:id="@+id/pushEntrustView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_selected" />
-    </RelativeLayout>
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index b3949de..fc74b59 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index b7f6e36..09cbf8b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -23,8 +23,8 @@
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
 import kotlinx.android.synthetic.main.activity_select_customer.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCustomerActivity : ApplicationBaseActivity() {
 
@@ -69,7 +69,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (customerModel == null) {
                 "请选择委托方".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
index 6f276be..8bea6bb 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
@@ -18,8 +18,10 @@
 import com.pengxh.kt.lite.extensions.toJson
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.activity_select_sample.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectSampleActivity : ApplicationBaseActivity() {
 
@@ -63,7 +65,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             val intent = Intent()
             intent.putExtra("sampleModels", sampleModels.toJson())
             setResult(RESULT_OK, intent)
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index 0fd0721..2dea624 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -7,38 +7,7 @@
     android:background="@color/mainBackground"
     android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight">
-
-        <ImageView
-            android:id="@+id/leftBackView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:rotation="-180"
-            android:src="@drawable/ic_right_black" />
-
-        <TextView
-            android:id="@+id/titleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:fontFamily="sans-serif-medium"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="委托需求"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-
-        <ImageView
-            android:id="@+id/pushEntrustView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_selected" />
-    </RelativeLayout>
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index b3949de..fc74b59 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 01f5ca1..99c2e13 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index b7f6e36..09cbf8b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -23,8 +23,8 @@
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
 import kotlinx.android.synthetic.main.activity_select_customer.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCustomerActivity : ApplicationBaseActivity() {
 
@@ -69,7 +69,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (customerModel == null) {
                 "请选择委托方".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
index 6f276be..8bea6bb 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
@@ -18,8 +18,10 @@
 import com.pengxh.kt.lite.extensions.toJson
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.activity_select_sample.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectSampleActivity : ApplicationBaseActivity() {
 
@@ -63,7 +65,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             val intent = Intent()
             intent.putExtra("sampleModels", sampleModels.toJson())
             setResult(RESULT_OK, intent)
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index 0fd0721..2dea624 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -7,38 +7,7 @@
     android:background="@color/mainBackground"
     android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight">
-
-        <ImageView
-            android:id="@+id/leftBackView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:rotation="-180"
-            android:src="@drawable/ic_right_black" />
-
-        <TextView
-            android:id="@+id/titleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:fontFamily="sans-serif-medium"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="委托需求"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-
-        <ImageView
-            android:id="@+id/pushEntrustView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_selected" />
-    </RelativeLayout>
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index b3949de..fc74b59 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 01f5ca1..99c2e13 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index f5c6693..d9481fc 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index 089066a..d8a71de 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -41,6 +41,7 @@
 import com.pengxh.kt.lite.vm.LoadState
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import kotlinx.android.synthetic.main.activity_entrust_add.*
+import kotlinx.android.synthetic.main.include_select_title.*
 import java.io.File
 
 
@@ -48,6 +49,9 @@
 
     private val context: Context = this@EntrustAddActivity
     private val gson by lazy { Gson() }
+    private val typeToken by lazy {
+        object : TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
+    }
     private lateinit var configViewModel: ConfigViewModel
     private lateinit var fileUploadViewModel: FileViewModel
     private lateinit var entrustViewModel: EntrustViewModel
@@ -157,18 +161,13 @@
 
                         val modelsJson = data.getStringExtra("sampleModels")
                         if (!modelsJson.isNullOrBlank()) {
-                            sampleModels = gson.fromJson(
-                                modelsJson,
-                                object :
-                                    TypeToken<ArrayList<SampleListModel.DataModel.RowsModel>>() {}.type
-                            )
+                            sampleModels = gson.fromJson(modelsJson, typeToken)
                         }
 
                         //刷新列表
                         dataBeans.clear()
                         sampleModels?.forEach {
-                            val model =
-                                EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
+                            val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel()
 
                             model.customerName = it.customerName
                             model.customerNo = it.customerNo
@@ -247,7 +246,7 @@
             navigatePageTo<WriteSampleActivity>()
         }
 
-        pushEntrustView.setOnClickListener {
+        selectedView.setOnClickListener {
             val sender = senderView.text.toString()
             if (sender.isBlank()) {
                 "请填写送样人名字".show(this)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
index f6ea904..0af7d31 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCountryActivity.kt
@@ -1,7 +1,6 @@
 package com.casic.xz.meterage.view.home
 
 import android.content.Intent
-import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.base.ApplicationBaseActivity
@@ -15,7 +14,9 @@
 import com.pengxh.kt.lite.extensions.readAssetsFile
 import com.pengxh.kt.lite.extensions.show
 import kotlinx.android.synthetic.main.activity_select_country.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCountryActivity : ApplicationBaseActivity() {
 
@@ -41,8 +42,6 @@
         countryRecyclerView.addItemDecoration(
             DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
         )
-        (countryRecyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations =
-            false
         countryRecyclerView.adapter = selectCountryAdapter
         selectCountryAdapter.setOnItemCheckedListener(object :
             SingleChoiceAdapter.OnItemCheckedListener<CountryCodeModel> {
@@ -53,7 +52,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (countryModel == null) {
                 "请选择厂家国别".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index b7f6e36..09cbf8b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -23,8 +23,8 @@
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.vm.LoadState
 import kotlinx.android.synthetic.main.activity_select_customer.*
-import kotlinx.android.synthetic.main.include_base_title.*
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectCustomerActivity : ApplicationBaseActivity() {
 
@@ -69,7 +69,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             if (customerModel == null) {
                 "请选择委托方".show(this)
                 return@setOnClickListener
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
index 6f276be..8bea6bb 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectSampleActivity.kt
@@ -18,8 +18,10 @@
 import com.pengxh.kt.lite.extensions.toJson
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.activity_select_sample.*
-import kotlinx.android.synthetic.main.include_base_title.*
+import kotlinx.android.synthetic.main.include_base_title.leftBackView
+import kotlinx.android.synthetic.main.include_base_title.titleView
 import kotlinx.android.synthetic.main.include_empty_view.*
+import kotlinx.android.synthetic.main.include_select_title.*
 
 class SelectSampleActivity : ApplicationBaseActivity() {
 
@@ -63,7 +65,9 @@
     }
 
     override fun initEvent() {
-        leftBackView.setOnClickListener {
+        leftBackView.setOnClickListener { finish() }
+
+        selectedView.setOnClickListener {
             val intent = Intent()
             intent.putExtra("sampleModels", sampleModels.toJson())
             setResult(RESULT_OK, intent)
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index 0fd0721..2dea624 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -7,38 +7,7 @@
     android:background="@color/mainBackground"
     android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/titleViewHeight">
-
-        <ImageView
-            android:id="@+id/leftBackView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:rotation="-180"
-            android:src="@drawable/ic_right_black" />
-
-        <TextView
-            android:id="@+id/titleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:fontFamily="sans-serif-medium"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="委托需求"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-
-        <ImageView
-            android:id="@+id/pushEntrustView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:src="@drawable/ic_selected" />
-    </RelativeLayout>
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index b3949de..fc74b59 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 01f5ca1..99c2e13 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index f5c6693..d9481fc 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include layout="@layout/include_base_title" />
+    <include layout="@layout/include_select_title" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_select_title.xml b/app/src/main/res/layout/include_select_title.xml
new file mode 100644
index 0000000..867e147
--- /dev/null
+++ b/app/src/main/res/layout/include_select_title.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/titleViewHeight">
+
+    <ImageView
+        android:id="@+id/leftBackView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:rotation="-180"
+        android:src="@drawable/ic_right_black" />
+
+    <TextView
+        android:id="@+id/titleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_toStartOf="@id/selectedView"
+        android:layout_toEndOf="@id/leftBackView"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center"
+        android:singleLine="true"
+        android:text="@string/app_name"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16" />
+
+    <ImageView
+        android:id="@+id/selectedView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:src="@drawable/ic_selected" />
+</RelativeLayout>
\ No newline at end of file