Browse Source

图片删除修改

ychk 3 months ago
parent
commit
b607a77364
2 changed files with 36 additions and 44 deletions
  1. 2 2
      app/build.gradle
  2. 34 42
      app/src/main/java/com/tofly/yxpc/ui/adapter/BigPictureAdapter.java

+ 2 - 2
app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 21
         //noinspection OldTargetApi
         targetSdkVersion 29
-        versionCode 89
-        versionName "8.9"
+        versionCode 90
+        versionName "9.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'arm64-v8a'

+ 34 - 42
app/src/main/java/com/tofly/yxpc/ui/adapter/BigPictureAdapter.java

@@ -147,54 +147,46 @@ public class BigPictureAdapter extends BaseQuickAdapter<FileBean, BaseViewHolder
         }
         ImageView delete = helper.getView(R.id.img_delete);
         if (isDelete) {
-            File file = new File(item.getFilePath());
-            if (!file.exists() && !isOnline) {
-                delete.setVisibility(View.GONE);
-            } else {
-                delete.setVisibility(View.VISIBLE);
-            }
+            delete.setVisibility(View.VISIBLE);
         } else {
             delete.setVisibility(View.GONE);
         }
-        delete.setOnClickListener(v -> {
-            DialogUtils.showDialog(mContext, "是否确认删除", "", true, (dialog, which) -> {
-                File file = new File(item.getFilePath());
-                if (file.exists()) {
-                    mData.remove(mData.get(position));
-                    listener.deletePicture(mData.size());
-                    notifyDataSetChanged();
-                } else {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("id", item.getId());
-                    map.put("filePath", item.getFilePath());
-                    map.put("fileName", item.getFileName());
-                    List<Map<String, Object>> maps = new ArrayList<>();
-                    maps.add(map);
-                    LatteNetWorkApi.getApiService(Api.class)
-                            .deletePicture(RequestBodyUtils.toRequestBodyJson(JSON.toJSONString(maps)))
-                            .compose(RxHelper.observableIO2Main(mContext))
-                            .subscribe(new MyObserver<BaseResponse>(mContext) {
-                                @Override
-                                public void onSuccess(BaseResponse demo) {
-                                    if (Constants.SUCCESS.equals(demo.getCode())) {
-                                        if (mContext != null) {
-                                            mData.remove(mData.get(position));
-                                            listener.deletePicture(mData.size());
-                                            notifyDataSetChanged();
-                                        }
-                                    } else {
-                                        ToastUtils.showToast("删除失败");
+        delete.setOnClickListener(v -> DialogUtils.showDialog(mContext, "是否确认删除", "", true, (dialog, which) -> {
+            if (!item.getFilePath().contains("http")) {
+                mData.remove(mData.get(position));
+                listener.deletePicture(mData.size());
+                notifyDataSetChanged();
+            } else {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", item.getId());
+                map.put("filePath", item.getFilePath());
+                map.put("fileName", item.getFileName());
+                List<Map<String, Object>> maps = new ArrayList<>();
+                maps.add(map);
+                LatteNetWorkApi.getApiService(Api.class)
+                        .deletePicture(RequestBodyUtils.toRequestBodyJson(JSON.toJSONString(maps)))
+                        .compose(RxHelper.observableIO2Main(mContext))
+                        .subscribe(new MyObserver<BaseResponse>(mContext) {
+                            @Override
+                            public void onSuccess(BaseResponse demo) {
+                                if (Constants.SUCCESS.equals(demo.getCode())) {
+                                    if (mContext != null) {
+                                        mData.remove(mData.get(position));
+                                        listener.deletePicture(mData.size());
+                                        notifyDataSetChanged();
                                     }
-                                }
-
-                                @Override
-                                public void onFailure(Throwable e, String errorMsg) {
+                                } else {
                                     ToastUtils.showToast("删除失败");
                                 }
-                            });
-                }
-            });
-        });
+                            }
+
+                            @Override
+                            public void onFailure(Throwable e, String errorMsg) {
+                                ToastUtils.showToast("删除失败");
+                            }
+                        });
+            }
+        }));
     }
 
     @Override