diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)

diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)
diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
index 804f3bd..fca9df9 100644
--- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
@@ -18,6 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class ObjectDetailActivity : KotlinBaseActivity<ActivityObjectDetailBinding>() {
 
@@ -75,7 +76,15 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
 
         binding.showImageView.setOnClickListener {
             //查数据库

diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)
diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
index 804f3bd..fca9df9 100644
--- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
@@ -18,6 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class ObjectDetailActivity : KotlinBaseActivity<ActivityObjectDetailBinding>() {
 
@@ -75,7 +76,15 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
 
         binding.showImageView.setOnClickListener {
             //查数据库
diff --git a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
index ca7789b..70ea812 100644
--- a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
@@ -6,7 +6,6 @@
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModelProvider
 import com.casic.detector.common.BuildConfig
@@ -23,6 +22,7 @@
 import com.pengxh.kt.lite.utils.FileDownloadManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.io.File
 
@@ -68,7 +68,15 @@
     }
 
     override fun initEvent() {
-        binding.titleInclude.leftBackView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
 
         binding.updateLayout.setOnClickListener {
             versionViewModel.getApplicationVersion()
@@ -90,7 +98,6 @@
 
     override fun setupTopBarLayout() {
         binding.rootView.initImmersionBar(this, true, R.color.white)
-        binding.titleInclude.titleView.visibility = View.GONE
     }
 
     private fun downloadApk(url: String?) {

diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)
diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
index 804f3bd..fca9df9 100644
--- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
@@ -18,6 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class ObjectDetailActivity : KotlinBaseActivity<ActivityObjectDetailBinding>() {
 
@@ -75,7 +76,15 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
 
         binding.showImageView.setOnClickListener {
             //查数据库
diff --git a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
index ca7789b..70ea812 100644
--- a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
@@ -6,7 +6,6 @@
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModelProvider
 import com.casic.detector.common.BuildConfig
@@ -23,6 +22,7 @@
 import com.pengxh.kt.lite.utils.FileDownloadManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.io.File
 
@@ -68,7 +68,15 @@
     }
 
     override fun initEvent() {
-        binding.titleInclude.leftBackView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
 
         binding.updateLayout.setOnClickListener {
             versionViewModel.getApplicationVersion()
@@ -90,7 +98,6 @@
 
     override fun setupTopBarLayout() {
         binding.rootView.initImmersionBar(this, true, R.color.white)
-        binding.titleInclude.titleView.visibility = View.GONE
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index 1df39e3..c4f59b6 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)
diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
index 804f3bd..fca9df9 100644
--- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
@@ -18,6 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class ObjectDetailActivity : KotlinBaseActivity<ActivityObjectDetailBinding>() {
 
@@ -75,7 +76,15 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
 
         binding.showImageView.setOnClickListener {
             //查数据库
diff --git a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
index ca7789b..70ea812 100644
--- a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
@@ -6,7 +6,6 @@
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModelProvider
 import com.casic.detector.common.BuildConfig
@@ -23,6 +22,7 @@
 import com.pengxh.kt.lite.utils.FileDownloadManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.io.File
 
@@ -68,7 +68,15 @@
     }
 
     override fun initEvent() {
-        binding.titleInclude.leftBackView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
 
         binding.updateLayout.setOnClickListener {
             versionViewModel.getApplicationVersion()
@@ -90,7 +98,6 @@
 
     override fun setupTopBarLayout() {
         binding.rootView.initImmersionBar(this, true, R.color.white)
-        binding.titleInclude.titleView.visibility = View.GONE
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index 1df39e3..c4f59b6 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index 729b1d4..b0cc380 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)
diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
index 804f3bd..fca9df9 100644
--- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
@@ -18,6 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class ObjectDetailActivity : KotlinBaseActivity<ActivityObjectDetailBinding>() {
 
@@ -75,7 +76,15 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
 
         binding.showImageView.setOnClickListener {
             //查数据库
diff --git a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
index ca7789b..70ea812 100644
--- a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
@@ -6,7 +6,6 @@
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModelProvider
 import com.casic.detector.common.BuildConfig
@@ -23,6 +22,7 @@
 import com.pengxh.kt.lite.utils.FileDownloadManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.io.File
 
@@ -68,7 +68,15 @@
     }
 
     override fun initEvent() {
-        binding.titleInclude.leftBackView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
 
         binding.updateLayout.setOnClickListener {
             versionViewModel.getApplicationVersion()
@@ -90,7 +98,6 @@
 
     override fun setupTopBarLayout() {
         binding.rootView.initImmersionBar(this, true, R.color.white)
-        binding.titleInclude.titleView.visibility = View.GONE
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index 1df39e3..c4f59b6 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index 729b1d4..b0cc380 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index cce69c1..84490e9 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -16,7 +16,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:fontFamily="sans-serif-black"
             android:gravity="center"
             android:text="事件上报"
             android:textColor="@color/themeColor"

diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)
diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
index 804f3bd..fca9df9 100644
--- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
@@ -18,6 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class ObjectDetailActivity : KotlinBaseActivity<ActivityObjectDetailBinding>() {
 
@@ -75,7 +76,15 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
 
         binding.showImageView.setOnClickListener {
             //查数据库
diff --git a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
index ca7789b..70ea812 100644
--- a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
@@ -6,7 +6,6 @@
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModelProvider
 import com.casic.detector.common.BuildConfig
@@ -23,6 +22,7 @@
 import com.pengxh.kt.lite.utils.FileDownloadManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.io.File
 
@@ -68,7 +68,15 @@
     }
 
     override fun initEvent() {
-        binding.titleInclude.leftBackView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
 
         binding.updateLayout.setOnClickListener {
             versionViewModel.getApplicationVersion()
@@ -90,7 +98,6 @@
 
     override fun setupTopBarLayout() {
         binding.rootView.initImmersionBar(this, true, R.color.white)
-        binding.titleInclude.titleView.visibility = View.GONE
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index 1df39e3..c4f59b6 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index 729b1d4..b0cc380 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index cce69c1..84490e9 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -16,7 +16,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:fontFamily="sans-serif-black"
             android:gravity="center"
             android:text="事件上报"
             android:textColor="@color/themeColor"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 7946ad6..887248f 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -7,9 +7,17 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include
-        android:id="@+id/titleInclude"
-        layout="@layout/include_base_title" />
+    <com.pengxh.kt.lite.widget.TitleBarView
+        android:id="@+id/titleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:tbv_left_image="@drawable/ic_left_black"
+        app:tbv_show_left_image="true"
+        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
+        app:tbv_text="@string/app_name"
+        app:tbv_text_color="@color/white" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
index 25b7d59..702653e 100644
--- a/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/NewObjectDetailActivity.kt
@@ -10,6 +10,7 @@
 import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class NewObjectDetailActivity : KotlinBaseActivity<ActivityNewObjectDetailBinding>() {
 
@@ -39,7 +40,16 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
+        
         binding.showImageView.setOnClickListener {
             finish()
             "此对象没相关照片".show(this)
diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
index 804f3bd..fca9df9 100644
--- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt
@@ -18,6 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
 
 class ObjectDetailActivity : KotlinBaseActivity<ActivityObjectDetailBinding>() {
 
@@ -75,7 +76,15 @@
     }
 
     override fun initEvent() {
-        binding.closeView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+
+            }
+
+            override fun onRightClick() {
+                finish()
+            }
+        })
 
         binding.showImageView.setOnClickListener {
             //查数据库
diff --git a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
index ca7789b..70ea812 100644
--- a/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/VersionControlActivity.kt
@@ -6,7 +6,6 @@
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModelProvider
 import com.casic.detector.common.BuildConfig
@@ -23,6 +22,7 @@
 import com.pengxh.kt.lite.utils.FileDownloadManager
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.io.File
 
@@ -68,7 +68,15 @@
     }
 
     override fun initEvent() {
-        binding.titleInclude.leftBackView.setOnClickListener { finish() }
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
 
         binding.updateLayout.setOnClickListener {
             versionViewModel.getApplicationVersion()
@@ -90,7 +98,6 @@
 
     override fun setupTopBarLayout() {
         binding.rootView.initImmersionBar(this, true, R.color.white)
-        binding.titleInclude.titleView.visibility = View.GONE
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index 1df39e3..c4f59b6 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index 729b1d4..b0cc380 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -13,29 +13,16 @@
         android:background="@color/white"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <com.pengxh.kt.lite.widget.TitleBarView
+            android:id="@+id/titleView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/titleViewHeight">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:fontFamily="sans-serif-black"
-                android:text="标识器信息"
-                android:textColor="@color/themeColor"
-                android:textSize="@dimen/sp_16" />
-
-            <ImageView
-                android:id="@+id/closeView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:paddingHorizontal="@dimen/dp_10"
-                android:src="@drawable/ic_close" />
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tbv_right_image="@drawable/ic_close"
+            app:tbv_show_right_image="true"
+            app:tbv_smaller_title="true"
+            app:tbv_text="标识器信息"
+            app:tbv_text_color="@color/themeColor" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index cce69c1..84490e9 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -16,7 +16,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:fontFamily="sans-serif-black"
             android:gravity="center"
             android:text="事件上报"
             android:textColor="@color/themeColor"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 7946ad6..887248f 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -7,9 +7,17 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <include
-        android:id="@+id/titleInclude"
-        layout="@layout/include_base_title" />
+    <com.pengxh.kt.lite.widget.TitleBarView
+        android:id="@+id/titleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:tbv_left_image="@drawable/ic_left_black"
+        app:tbv_show_left_image="true"
+        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
+        app:tbv_text="@string/app_name"
+        app:tbv_text_color="@color/white" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_base_title.xml b/app/src/main/res/layout/include_base_title.xml
deleted file mode 100644
index c252d85..0000000
--- a/app/src/main/res/layout/include_base_title.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        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" />
-</RelativeLayout>
\ No newline at end of file