coding
diff --git a/‎app/src/main/java/net/coding/program/project/detail/AttachmentsActivity.java‎
Lines changed: 53 additions & 4 deletions b/‎app/src/main/java/net/coding/program/project/detail/AttachmentsActivity.java‎
Lines changed: 53 additions & 4 deletions
@@ -80,6 +80,9 @@ public class AttachmentsActivity extends FileDownloadBaseActivity implements Foo
     final public static int FILE_SELECT_CODE = 10;
     final public static int FILE_DELETE_CODE = 11;
     final public static int FILE_MOVE_CODE = 12;
+
+    private static final String TAG_HTTP_FILE_EXIST = "TAG_HTTP_FILE_EXIST";
+
     private static String TAG = AttachmentsActivity.class.getSimpleName();
     @Extra
     int mProjectObjectId;
@@ -597,7 +600,7 @@ public void loadMore() {
     }
 
     @Override
-    public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
+    public void parseJson(int code, JSONObject respanse, String tag, int pos, final Object data) throws JSONException {
         if (tag.equals(urlFiles)) {
             if (code == 0) {
                 JSONArray files = respanse.getJSONObject("data").getJSONArray("list");
@@ -722,6 +725,23 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
             } else {
                 showErrorMsg(code, respanse);
             }
+        } else if (tag.equals(TAG_HTTP_FILE_EXIST)) {
+            if (code == 0) {
+                String s = respanse.optJSONObject("data").optString("conflict_file");
+                if (s.isEmpty()) {
+                    uploadFile((File) data);
+                } else {
+                    File file = (File) data;
+                    showDialog(file.getName(), "存在同名文件，是否覆盖？", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            uploadFile((File) data);
+                        }
+                    });
+                }
+            } else {
+                showErrorMsg(code, respanse);
+            }
         }
     }
 
@@ -747,10 +767,15 @@ void onResult(int resultCode, Intent data) {
             Uri uri = data.getData();
             String path = FileUtil.getPath(this, uri);
             File selectedFile = new File(path);
-            uploadFile(selectedFile);
+            uploadFilePrepare(selectedFile);
         }
     }
 
+    private void uploadFilePrepare(File selectedFile) {
+        String httpHost = getHttpFileExist(selectedFile.getName(), mAttachmentFolderObject);
+        getNetwork(httpHost, TAG_HTTP_FILE_EXIST, -1, selectedFile);
+    }
+
     private void uploadFile(File selectedFile) {
 
         try {
@@ -781,7 +806,20 @@ public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
                         if (code == 0) {
                             AttachmentFileObject newFile = new AttachmentFileObject(response.getJSONObject("data"));
                             setDownloadStatus(newFile);
-                            mFilesArray.add(mAttachmentFolderObject.sub_folders.size(), newFile);
+
+                            int i = 0;
+                            for (; i < mFilesArray.size(); ++i) {
+                                AttachmentFileObject item = mFilesArray.get(i);
+                                String itemName = item.getName();
+                                if (!item.isFolder && itemName.equals(newFile.getName())) {
+                                    mFilesArray.set(i, newFile);
+                                    break;
+                                }
+                            }
+                            if (i == mFilesArray.size()) {
+                                mFilesArray.add(mAttachmentFolderObject.sub_folders.size(), newFile);
+                            }
+
                             adapter.notifyDataSetChanged();
                             setResult(Activity.RESULT_OK);
                             showUploadStatus(UploadStatus.Finish);
@@ -829,6 +867,18 @@ public void onProgress(int bytesWritten, int totalSize) {
 
     }
 
+
+    private String getHttpFileExist(String name, AttachmentFolderObject folder) {
+        String encodeName = Global.encodeUtf8(name);
+        return Global.HOST_API +
+                mProject.getProjectPath() +
+                "/dir/" +
+                folder.file_id +
+                "/files/existed?names=" +
+                encodeName;
+    }
+
+
     private void showUploadStatus(UploadStatus status) {
         switch (status) {
             case Uploading:
@@ -1368,7 +1418,6 @@ public void checkFileDownloadStatus() {
     }
 
 
-
     protected String getLink() {
         if (mProjectObject == null) {
             showButtomToast("获取项目信息失败，请稍后重试");