修改个人主页添加照片、编辑个人添加照片、发布动态添加照片不能多次添加的问题

modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java

@@ -241,13 +241,14 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
             uploadedUrls.add(url); // 添加到最后
         }
 
-        if (uploadedUrls.size() == total) {
+//        if (uploadedUrls.size() == total) {
             updateAdapterData(); // 所有图片上传完成，更新适配器数据
-        }
+//        }
     }
 
     @Override
     public void upAddAlbum() {
+        uploadedUrls.clear();
         MvpPre.getAlbumDetail(albumId, pwd, page + "", "10");
     }
 
@@ -299,6 +300,12 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
         updateZanButtonUI(albumBean1);
     }
 
+    @Override
+    public void findAlbum() {
+        mBinding.smartRefreshLayout.finishRefresh() ;
+        mBinding.smartRefreshLayout.finishLoadMore() ;
+    }
+
     private void updateAdapterData() {
         String imageUrlsString = TextUtils.join(",", uploadedUrls);
         MvpPre.upAddAlbum(albumId, imageUrlsString, "");
@@ -307,6 +314,7 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
     @Override
     protected void onResume() {
         super.onResume();
+        page=1;
         MvpPre.getAlbumDetail(albumId, pwd, "1", "10");
     }
 
@@ -385,9 +393,20 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
         }
         mBinding.dyComment.setText(albumBean.getLike_num() != null && !albumBean.getLike_num().isEmpty() ? albumBean.getLike_num() : "0");
         mBinding.lockComment.setText(albumBean.getRead_num() != null && !albumBean.getRead_num().isEmpty() ? albumBean.getRead_num() : "0");
-        List<AlbumBean.ImageList> allImages = albumBean.getImage_list();
-        List<AlbumBean.ImageList> groupedPhotos = groupPhotos(allImages);
-        adapter.setNewData(groupedPhotos);
+        if (albumBean.getImage_list() != null && !albumBean.getImage_list().isEmpty()) {
+            List<AlbumBean.ImageList> allImages = albumBean.getImage_list();
+            List<AlbumBean.ImageList> groupedPhotos = groupPhotos(allImages);
+            if (page==1) {
+                adapter.setNewData(groupedPhotos);
+            }else {
+                adapter.addData(groupedPhotos);
+            }
+        }else {
+            page=1;
+            if (albumBean.getCount()==null || albumBean.getCount().equals("0")){
+                adapter.setNewData( new ArrayList<>());
+            }
+        }
 
 
     }

modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java

@@ -344,6 +344,7 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
     @Override
     public void editUserInfoSuccess(String s) {
         ToastUtils.showShort(s);
+        uploadedUrls.clear();
         MvpPre.getUserHome(SpUtil.getUserId() + "");
     }
 
@@ -366,15 +367,21 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
 //            list.add(new UserImgList("1", url));
 //            mUserPhotoWallAdapter.setNewData(list);
 
-            if (index >= 0 && index < uploadedUrls.size()) {
-                uploadedUrls.add(index, url); // 插入到对应位置
-            } else {
-                uploadedUrls.add(url); // 添加到最后
+            try {
+                if (index >= 0 && index <= uploadedUrls.size()) {
+                    uploadedUrls.add(index, url);
+                    LogUtils.d("EditUserInfoActivity", "图片已插入到位置 "+index);
+                } else {
+                    uploadedUrls.add(url);
+                    LogUtils.d("EditUserInfoActivity", "图片已添加到末尾");
+                }
+            } catch (Exception e) {
+                LogUtils.e("EditUserInfoActivity", "处理图片URL时出错: " + e.getMessage());
+                uploadedUrls.add(url);
             }
-
-            if (uploadedUrls.size() == total) {
+//            if (uploadedUrls.size() == total) {
                 updateAdapterData(); // 所有图片上传完成，更新适配器数据
-            }
+//            }
         }
     }
 

modulevocal/src/main/java/com/example/modulevocal/conacts/AlbumDetailConacts.java

@@ -24,6 +24,8 @@ public class AlbumDetailConacts {
         void deleteAlbum();
         void likeAlbum();
 
+        void findAlbum();
+
     }
     public interface IMePre extends IPresenter {
         void getAlbumDetail(String albumId,String pwd,String page,String page_limit);

modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java

@@ -33,6 +33,7 @@ public class AlbumDetailPresenter extends BasePresenter<AlbumDetailConacts.View>
             @Override
             public void onNext(AlbumBean albumBean) {
                 MvpRef.get().getAlbumDetail(albumBean);
+                MvpRef.get().findAlbum();
             }
         });
     }