diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
index 13487f4..f071931 100644
--- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
+++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
@@ -143,6 +143,7 @@
                                     intent.setClass(requireContext(), ChangeShopInfoActivity.class);
                                     break;
                                 case "部门处置":
+                                    //TODO 写的太繁琐，后续优化
                                     intent.setClass(requireContext(), DeptHandleActivity.class);
                                     break;
                                 case "路桥养护":

diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
index 13487f4..f071931 100644
--- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
+++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
@@ -143,6 +143,7 @@
                                     intent.setClass(requireContext(), ChangeShopInfoActivity.class);
                                     break;
                                 case "部门处置":
+                                    //TODO 写的太繁琐，后续优化
                                     intent.setClass(requireContext(), DeptHandleActivity.class);
                                     break;
                                 case "路桥养护":
diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java
index af6d939..01feebb 100644
--- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java
+++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java
@@ -39,6 +39,7 @@
 import com.pengxh.androidx.lite.kit.StringKit;
 import com.pengxh.androidx.lite.utils.LoadState;
 import com.pengxh.androidx.lite.utils.WeakReferenceHandler;
+import com.pengxh.androidx.lite.widget.TitleBarView;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -46,7 +47,8 @@
 
 public class ChangeShopInfoActivity extends AndroidxBaseActivity<ActivityChangeShopBinding> implements Handler.Callback {
 
-    private final Context context = ChangeShopInfoActivity.this;
+    private final Context context = this;
+    private final WeakReferenceHandler weakReferenceHandler = new WeakReferenceHandler(this);
     private final ArrayList<String> realPaths = new ArrayList<>(); //真实图片路径
     private final List<String> imageList = new ArrayList<>(); //上传到服务器的数据集
     private UploadViewModel uploadViewModel;
@@ -54,7 +56,6 @@
     private String merchantId;  //商户id
     private String merchantName;
     private EditableImageAdapter imageAdapter;
-    private WeakReferenceHandler weakReferenceHandler;
 
     //新版onActivityResult
     private final ActivityResultLauncher<Intent> changeShopInfoLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
@@ -78,9 +79,17 @@
     @Override
     protected void setupTopBarLayout() {
         ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white);
+        binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() {
+            @Override
+            public void onLeftClick() {
+                finish();
+            }
 
-        binding.titleBarLayout.titleView.setText("商铺变更");
-        binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+            @Override
+            public void onRightClick() {
+
+            }
+        });
     }
 
     @Override
@@ -109,8 +118,6 @@
 
     @Override
     protected void initOnCreate(@Nullable Bundle savedInstanceState) {
-        weakReferenceHandler = new WeakReferenceHandler(this);
-
         uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class);
         shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class);
 
@@ -186,7 +193,8 @@
             public void onItemLongClick(@Nullable View view, int position) {
                 imageList.remove(position);
                 realPaths.remove(position);
-                imageAdapter.notifyDataSetChanged();
+                imageAdapter.notifyItemRemoved(position);
+                imageAdapter.notifyItemRangeChanged(position, realPaths.size() - position);
             }
         });
 
@@ -196,8 +204,9 @@
                 if (resultBean.getCode() == 200) {
                     String url = resultBean.getData();
                     imageList.add(url);
+                    int oldSize = realPaths.size();
                     realPaths.add(StringHelper.appendCompleteURL(url));
-                    imageAdapter.notifyDataSetChanged();
+                    imageAdapter.notifyItemRangeChanged(oldSize, 1);
                 }
             }
         });

diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
index 13487f4..f071931 100644
--- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
+++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java
@@ -143,6 +143,7 @@
                                     intent.setClass(requireContext(), ChangeShopInfoActivity.class);
                                     break;
                                 case "部门处置":
+                                    //TODO 写的太繁琐，后续优化
                                     intent.setClass(requireContext(), DeptHandleActivity.class);
                                     break;
                                 case "路桥养护":
diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java
index af6d939..01feebb 100644
--- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java
+++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java
@@ -39,6 +39,7 @@
 import com.pengxh.androidx.lite.kit.StringKit;
 import com.pengxh.androidx.lite.utils.LoadState;
 import com.pengxh.androidx.lite.utils.WeakReferenceHandler;
+import com.pengxh.androidx.lite.widget.TitleBarView;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -46,7 +47,8 @@
 
 public class ChangeShopInfoActivity extends AndroidxBaseActivity<ActivityChangeShopBinding> implements Handler.Callback {
 
-    private final Context context = ChangeShopInfoActivity.this;
+    private final Context context = this;
+    private final WeakReferenceHandler weakReferenceHandler = new WeakReferenceHandler(this);
     private final ArrayList<String> realPaths = new ArrayList<>(); //真实图片路径
     private final List<String> imageList = new ArrayList<>(); //上传到服务器的数据集
     private UploadViewModel uploadViewModel;
@@ -54,7 +56,6 @@
     private String merchantId;  //商户id
     private String merchantName;
     private EditableImageAdapter imageAdapter;
-    private WeakReferenceHandler weakReferenceHandler;
 
     //新版onActivityResult
     private final ActivityResultLauncher<Intent> changeShopInfoLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
@@ -78,9 +79,17 @@
     @Override
     protected void setupTopBarLayout() {
         ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white);
+        binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() {
+            @Override
+            public void onLeftClick() {
+                finish();
+            }
 
-        binding.titleBarLayout.titleView.setText("商铺变更");
-        binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish());
+            @Override
+            public void onRightClick() {
+
+            }
+        });
     }
 
     @Override
@@ -109,8 +118,6 @@
 
     @Override
     protected void initOnCreate(@Nullable Bundle savedInstanceState) {
-        weakReferenceHandler = new WeakReferenceHandler(this);
-
         uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class);
         shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class);
 
@@ -186,7 +193,8 @@
             public void onItemLongClick(@Nullable View view, int position) {
                 imageList.remove(position);
                 realPaths.remove(position);
-                imageAdapter.notifyDataSetChanged();
+                imageAdapter.notifyItemRemoved(position);
+                imageAdapter.notifyItemRangeChanged(position, realPaths.size() - position);
             }
         });
 
@@ -196,8 +204,9 @@
                 if (resultBean.getCode() == 200) {
                     String url = resultBean.getData();
                     imageList.add(url);
+                    int oldSize = realPaths.size();
                     realPaths.add(StringHelper.appendCompleteURL(url));
-                    imageAdapter.notifyDataSetChanged();
+                    imageAdapter.notifyItemRangeChanged(oldSize, 1);
                 }
             }
         });
diff --git a/app/src/main/res/layout/activity_change_shop.xml b/app/src/main/res/layout/activity_change_shop.xml
index e13b905..49fca27 100644
--- a/app/src/main/res/layout/activity_change_shop.xml
+++ b/app/src/main/res/layout/activity_change_shop.xml
@@ -7,9 +7,16 @@
     android:background="@color/mainBackColor"
     android:orientation="vertical">
 
-    <include
-        android:id="@+id/titleBarLayout"
-        layout="@layout/include_sub_base_title" />
+    <com.pengxh.androidx.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_right_image="false"
+        app:tbv_smaller_title="true"
+        app:tbv_text="商铺变更"
+        app:tbv_text_color="@color/mainTextColor" />
 
     <include layout="@layout/include_line_view" />