From 56573deea1f13c842439c0925dadae5f4ea58bc3 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Mon, 25 May 2020 17:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=9B=9E=E7=AD=94/?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=8D=89=E7=A8=BF=E6=97=A0=E6=B3=95=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qa/answer/draft/AnswerDraftAdapter.java     | 17 +++++++++++++----
 .../qa/answer/draft/AnswerDraftFragment.java    |  6 +++++-
 .../qa/article/draft/ArticleDraftFragment.kt    |  2 +-
 .../gamecenter/retrofit/service/ApiService.java |  8 +++++++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java
index 02c9922de4..0433bb2744 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java
@@ -30,11 +30,13 @@ import com.gh.gamecenter.qa.myqa.AnswerDraftViewHolder;
 import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.gh.gamecenter.retrofit.service.ApiService;
 import com.lightgame.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
@@ -50,13 +52,18 @@ class AnswerDraftAdapter extends ListAdapter<AnswerEntity> {
 
     private ListViewModel mListViewModel;
 
+    private String mAnswerId;
     private String mEntrance;
 
-    AnswerDraftAdapter(Context context, String entrance, OnListClickListener listClickListener, ListViewModel longClickListener) {
+    AnswerDraftAdapter(Context context, String entrance,
+                       OnListClickListener listClickListener,
+                       ListViewModel longClickListener,
+                       String answerId) {
         super(context);
         mListClickListener = listClickListener;
         mListViewModel = longClickListener;
         mEntrance = entrance;
+        mAnswerId = answerId;
     }
 
     @Override
@@ -163,9 +170,11 @@ class AnswerDraftAdapter extends ListAdapter<AnswerEntity> {
 
 
     private void deleteAnswerDraft(AnswerEntity entity) {
-        RetrofitManager.getInstance(mContext)
-                .getApi()
-                .deleteAnswerDrafts(UserManager.getInstance().getUserId(), entity.getId())
+        ApiService api = RetrofitManager.getInstance(mContext).getApi();
+        Observable<ResponseBody> deleteAnswerDraftObservable = !TextUtils.isEmpty(mAnswerId) ?
+                api.deleteAnswerDrafts(UserManager.getInstance().getUserId(), mAnswerId, entity.getId()) :
+                api.deleteAnswerDrafts(UserManager.getInstance().getUserId(), entity.getId());
+        deleteAnswerDraftObservable
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<ResponseBody>() {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java
index dc499b4f70..2264f48553 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java
@@ -57,7 +57,11 @@ public class AnswerDraftFragment extends ListFragment<AnswerEntity, NormalListVi
 
     @Override
     protected ListAdapter provideListAdapter() {
-        return mAdapter == null ? mAdapter = new AnswerDraftAdapter(getContext(), mEntrance, this, mListViewModel) : mAdapter;
+        return mAdapter == null ? mAdapter = new AnswerDraftAdapter(getContext(),
+                mEntrance,
+                this,
+                mListViewModel,
+                mAnswerId) : mAdapter;
     }
 
     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt
index e32090bd0e..013e935732 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt
@@ -81,7 +81,7 @@ class ArticleDraftFragment : ListFragment<ArticleDraftEntity, NormalListViewMode
                 if (mArticleId.isNullOrEmpty()) {
                     mApi.deleteArticleDrafts(entity.community.id, entity.id)
                 } else {
-                    mApi.deleteArticleDrafts(entity.community.id, entity.id, mArticleId)
+                    mApi.deleteArticleDrafts(entity.community.id, mArticleId, entity.id)
                 }
         deleteArticleDraftsObservable
                 .subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
index 2cfd8d75f3..c67f1f3c1a 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
@@ -955,11 +955,17 @@ public interface ApiService {
     Observable<ResponseBody> postAnswerDrafts(@Body RequestBody body, @Path("user_id") String user_id);
 
     /**
-     * 删除用户草稿
+     * 删除用户草稿(撰写)
      */
     @DELETE("users/{user_id}/answer_drafts/{draft_id}")
     Observable<ResponseBody> deleteAnswerDrafts(@Path("user_id") String userId, @Path("draft_id") String draftId);
 
+    /**
+     * 删除用户草稿(编辑)
+     */
+    @DELETE("users/{user_id}/answers/{answer_id}/answer_drafts/{draft_id}")
+    Observable<ResponseBody> deleteAnswerDrafts(@Path("user_id") String userId, @Path("answer_id") String id, @Path("draft_id") String draftId);
+
     /**
      * 获取用户收藏的回答列表
      */