diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java
index f57a5d5b07..c80f9a8d6f 100644
--- a/app/src/main/java/com/gh/common/util/EntranceUtils.java
+++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java
@@ -102,6 +102,7 @@ public class EntranceUtils {
     public static final String KEY_AUTO_DOWNLOAD = "auto_download";
     public static final String KEY_AUTO_UPDATE = "auto_update";
     public static final String KEY_HIDE_SUGGEST_HINT = "hide_suggest_hint";
+    public static final String KEY_COMMUNITY_ARTICLE_ID = "communityArticleId";
 
     public static void jumpActivity(Context context, Bundle bundle) {
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt
index 00ed55e4b5..a4f7316744 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt
@@ -36,7 +36,7 @@ class MyArticleActivity : ListActivity<ArticleEntity, NormalListViewModel<Articl
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == PUBLISH_ARTICLE_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            mListViewModel.load(LoadType.RETRY)
+            mListViewModel.load(LoadType.REFRESH)
         }
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt
index 0aac4d81b6..3575bd829a 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt
@@ -1,5 +1,6 @@
 package com.gh.gamecenter.qa.article.draft
 
+import android.app.Activity
 import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
@@ -26,7 +27,14 @@ class ArticleDraftActivity : ListActivity<ArticleDraftEntity, NormalListViewMode
 
     override fun provideListAdapter(): ArticleDraftAdapter {
         if (mAdapter == null) {
-            mAdapter = ArticleDraftAdapter(this) { deleteDraft(it) }
+            mAdapter = ArticleDraftAdapter(this
+                    , deleteCallback = { deleteDraft(it) }
+                    , selectCallback = {
+                val intent = Intent()
+                intent.putExtra(ArticleDraftEntity::class.java.simpleName, it)
+                setResult(Activity.RESULT_OK, intent)
+                finish()
+            })
         }
         return mAdapter!!
     }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt
index 8639d6ff0a..d5fbfd1971 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftAdapter.kt
@@ -5,13 +5,17 @@ import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import com.gh.common.constant.ItemViewType
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.NewsUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.baselist.ListAdapter
 import com.gh.gamecenter.databinding.CommunityArticleDraftItemBinding
 import com.gh.gamecenter.qa.entity.ArticleDraftEntity
 
-class ArticleDraftAdapter(context: Context, private val deleteCallback: (ArticleDraftEntity) -> Unit) : ListAdapter<ArticleDraftEntity>(context) {
+class ArticleDraftAdapter(context: Context
+                          , private val deleteCallback: (ArticleDraftEntity) -> Unit
+                          , private val selectCallback: (ArticleDraftEntity) -> Unit) : ListAdapter<ArticleDraftEntity>(context) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val view: View
@@ -30,9 +34,16 @@ class ArticleDraftAdapter(context: Context, private val deleteCallback: (Article
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is ArticleDraftViewHolder) {
             val entity = mEntityList[position]
-            holder.itemView.setOnLongClickListener {
-                deleteCallback.invoke(entity)
-                return@setOnLongClickListener true
+            holder.binding.data = entity
+            holder.binding.articleDraftTime.text = ("发布于" + NewsUtils.getFormattedTime(entity.time.update))
+            holder.binding.articleDraftDelete.setOnClickListener {
+                DialogUtils.showAlertDialog(mContext, "警告", "确定要删除文章草稿吗？删除之后不可恢复",
+                        "确定", "取消", DialogUtils.ConfirmListener {
+                    deleteCallback.invoke(entity)
+                }, null)
+            }
+            holder.itemView.setOnClickListener {
+                selectCallback.invoke(entity)
             }
         } else if (holder is FooterViewHolder) {
             holder.initFooterViewHolder(mIsLoading, isNetworkError, mIsOver, R.string.ask_loadover_hint)
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt
index c693477cde..db0450007d 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt
@@ -34,9 +34,11 @@ import com.gh.gamecenter.entity.CommunityEntity
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.qa.article.draft.ArticleDraftActivity
 import com.gh.gamecenter.qa.article.game.ArticleSelectGameAdapter
+import com.gh.gamecenter.qa.entity.ArticleDraftEntity
 import com.gh.gamecenter.qa.questions.edit.TagsSelectFragment
 import kotterknife.bindView
 
+// todo 定时保存
 class ArticleEditActivity : BaseActivity() {
 
     private val mEditContent by bindView<RichEditor>(R.id.article_edit_content)
@@ -63,6 +65,11 @@ class ArticleEditActivity : BaseActivity() {
         } else if (requestCode == ArticleEditActivity.ARTICLE_DRAFT_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
             // 补充 草稿
             setNavigationTitle("编辑文章")
+            val draftEntity = data?.getParcelableExtra<ArticleDraftEntity>(ArticleDraftEntity::class.java.simpleName)
+            mViewModel?.mSelectCommunityData = draftEntity?.community
+            mEditTitle.setText(draftEntity?.title)
+            setGameName()
+            mViewModel?.getArticleDraftsContent(draftEntity?.id!!)
         }
     }
 
@@ -88,6 +95,20 @@ class ArticleEditActivity : BaseActivity() {
             mEditContent.insertImage(it)
         })
 
+        // 保存草稿
+        mViewModel?.postArticleDrafts?.observe(this, Observer {
+            if (it!!) {
+                toast("回答已保存到草稿箱")
+                finish()
+            } else {
+                toast("保存失败")
+            }
+        })
+
+        mViewModel?.articleDraftsContent?.observe(this, Observer {
+            mEditContent.setHtml(it, false)
+        })
+
         mViewModel?.titleTags?.observe(this, Observer<List<String>> {
             if (supportFragmentManager.findFragmentByTag(TagsSelectFragment::javaClass.name) == null) {
                 val dialog = BaseDialogWrapperFragment.getInstance(ArticleTagsSelectFragment.getInstance(), false)
@@ -95,6 +116,7 @@ class ArticleEditActivity : BaseActivity() {
             }
         })
 
+
         // Process dialog
         mViewModel?.processDialog?.observe(this, Observer { it ->
             if (it?.isShow!!) {
@@ -165,7 +187,12 @@ class ArticleEditActivity : BaseActivity() {
         } else if (mEditContent.html.contains("<img src")
                 || !TextUtils.isEmpty(mEditContent.text)
                 || !TextUtils.isEmpty(mEditTitle.text.trim())) {
-
+            if (mViewModel?.mSelectCommunityData == null) {
+                toast("必须选择游戏才能保存到草稿")
+            }
+            mViewModel?.title = mEditTitle.text.toString()
+            mViewModel?.content = mEditContent.html
+            mViewModel?.postArticleDrafts()
             return true
         }
         return false
@@ -183,10 +210,7 @@ class ArticleEditActivity : BaseActivity() {
         recyclerView.layoutManager = GridLayoutManager(this, 4)
         recyclerView.adapter = ArticleSelectGameAdapter(this, loading) {
             mViewModel?.mSelectCommunityData = CommunityEntity(it.id!!, it.name!!)
-            mGameName.text = it.name!!
-            mGameName.gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
-            mGameName.setBackgroundDrawable(ColorDrawable(0))
-            mGameName.setTextColor(Color.BLACK)
+            setGameName()
             selectGameDialog.cancel()
 
             mViewModel?.getDefaultTag()
@@ -198,6 +222,13 @@ class ArticleEditActivity : BaseActivity() {
         selectGameDialog.show()
     }
 
+    private fun setGameName() {
+        mGameName.text = mViewModel?.mSelectCommunityData?.name
+        mGameName.gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
+        mGameName.setBackgroundDrawable(ColorDrawable(0))
+        mGameName.setTextColor(Color.BLACK)
+    }
+
     override fun onMenuItemClick(item: MenuItem?): Boolean {
         if (item?.itemId == R.id.menu_answer_post) {
             mViewModel?.title = mEditTitle.text.toString()
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt
index aaf3966370..8afdd910b3 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt
@@ -23,6 +23,7 @@ import io.reactivex.schedulers.Schedulers
 import okhttp3.MediaType
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
+import org.json.JSONArray
 import org.json.JSONObject
 import retrofit2.HttpException
 import java.io.File
@@ -39,6 +40,8 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat
     val processDialog = MediatorLiveData<WaitingDialogFragment.WaitingDialogData>()
     val postImage = MediatorLiveData<String>()
     val postArticle = MediatorLiveData<String>()
+    val postArticleDrafts = MediatorLiveData<Boolean>()
+    val articleDraftsContent = MediatorLiveData<String>()
 
     var uploadImageSubscription: Disposable? = null
 
@@ -210,12 +213,7 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat
 
     fun postArticle() {
         processDialog.postValue(WaitingDialogFragment.WaitingDialogData("上传中...", true))
-
-        val jsonObject = JSONObject()
-        jsonObject.put("title", title)
-        jsonObject.put("content", content) // todo 替换图片链接
-        jsonObject.put("tags", selectedTags)
-        val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+        val body = RequestBody.create(MediaType.parse("application/json"), getArticleBody())
         mApi.postCommunityArticle(mSelectCommunityData?.id, body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -230,4 +228,58 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat
                     }
                 })
     }
+
+    fun postArticleDrafts() {
+        val body = RequestBody.create(MediaType.parse("application/json"), getArticleBody())
+        mApi.postCommunityArticleDrafts(mSelectCommunityData?.id, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        postArticleDrafts.postValue(true)
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        postArticleDrafts.postValue(false)
+                    }
+                })
+    }
+
+    private fun getArticleBody(): String {
+        for (s in mapImg.keys) {
+            content = content?.replace(FILE_HOST + s, mapImg[s].toString())
+        }
+        val tags = JSONArray()
+        for (tag in selectedTags) {
+            tags.put(tag)
+        }
+        val jsonObject = JSONObject()
+        jsonObject.put("title", title)
+        jsonObject.put("content", content)
+        jsonObject.put("tags", tags)
+        return jsonObject.toString()
+    }
+
+    fun getArticleDraftsContent(draftId: String) {
+        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("加载中...", true))
+        mApi.getArticleDraftsContent(mSelectCommunityData?.id, draftId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        val string = response?.string()
+                        if (string != null) {
+                            val jsonObject = JSONObject(string)
+                            val content = jsonObject.getString("content")
+                            articleDraftsContent.postValue(content)
+                        }
+
+                        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("加载中...", false))
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("加载中...", false))
+                    }
+                })
+    }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt
index 62e8f8cf85..a770f02628 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt
@@ -1,5 +1,6 @@
 package com.gh.gamecenter.qa.article.edit
 
+import android.app.Activity
 import android.app.Dialog
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders
@@ -50,7 +51,8 @@ class ArticleTagsSelectFragment : BaseFragment<String>() {
         initTags()
 
         mViewModel?.postArticle?.observe(this, Observer {
-            //todo 提交成功
+            activity?.setResult(Activity.RESULT_OK)
+            activity?.finish()
         })
 
         mCancelBtn.setOnClickListener {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleDraftEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleDraftEntity.kt
index a9dae1a9a5..0f5f3c5e99 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleDraftEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleDraftEntity.kt
@@ -1,15 +1,19 @@
 package com.gh.gamecenter.qa.entity
 
+import android.os.Parcelable
 import com.gh.gamecenter.entity.CommunityEntity
 import com.google.gson.annotations.SerializedName
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 data class ArticleDraftEntity(@SerializedName("_id")
                               val id: String = "",
                               val title: String = "",
                               val content: String = "",
                               val count: Count = Count(),
                               val time: Time = Time(),
-                              val community: CommunityEntity = CommunityEntity())
+                              val community: CommunityEntity = CommunityEntity()) : Parcelable
 
+@Parcelize
 data class Time(val create: Long = 0,
-                val update: Long = 0)
\ No newline at end of file
+                val update: Long = 0): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt
index 02a56412d9..fe7b5f15d3 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt
@@ -1,8 +1,10 @@
 package com.gh.gamecenter.qa.entity
 
+import android.os.Parcelable
 import com.gh.gamecenter.entity.CommunityEntity
 import com.gh.gamecenter.entity.UserEntity
 import com.google.gson.annotations.SerializedName
+import kotlinx.android.parcel.Parcelize
 
 data class ArticleEntity(@SerializedName("_id")
                          val id: String = "",
@@ -13,7 +15,10 @@ data class ArticleEntity(@SerializedName("_id")
                          val community: CommunityEntity = CommunityEntity(),
                          val user : UserEntity = UserEntity())
 
+@Parcelize
 data class Count(
         val comment: Int = -1,
         val vote: Int = -1,
-        val answer: Int = -1)
+        val answer: Int = -1) : Parcelable {
+
+}
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 08036c8016..6a4b3db086 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
@@ -1194,25 +1194,25 @@ public interface ApiService {
     /**
      * 保存社区文章的草稿
      */
-    @POST("communities/{community_id}/articles_drafts")
+    @POST("communities/{community_id}/article_drafts")
     Observable<ResponseBody> postCommunityArticleDrafts(@Path("community_id") String communityId, @Body RequestBody body);
 
     /**
      * 获取社区文章列表
      */
-    @GET("users/{user_id}/articles")
+    @GET("users/{user_id}/communities/articles")
     Observable<List<ArticleEntity>> getMyArticle(@Path("user_id") String userId, @Query("page") int page);
 
     /**
-     * 获取草稿的内容
+     * 获取用户的文章草稿列表
      */
-    @GET("users/{user_id}/articles_drafts")
+    @GET("users/{user_id}/communities/article_drafts")
     Observable<List<ArticleDraftEntity>> getMyArticleDrafts(@Path("user_id") String userId, @Query("page") int page);
 
     /**
      * 删除社区文章的草稿
      */
-    @DELETE("communities/{community_id}/articles_drafts/{draft_id}")
+    @DELETE("communities/{community_id}/article_drafts/{draft_id}")
     Observable<ResponseBody> deleteArticleDrafts(@Path("community_id") String communityId, @Path("draft_id") String draftId);
 
     /**
@@ -1221,6 +1221,13 @@ public interface ApiService {
     @GET("communities/{community_id}/articles/{article_id}")
     Observable<ArticleDetailEntity> getCommunityArticleDetail(@Path("community_id") String communityId, @Path("article_id") String articleId);
 
+
+    /**
+     * 获取社区文章草稿内容
+     */
+    @GET("communities/{community_id}/article_drafts/{draft_id}")
+    Observable<ResponseBody> getArticleDraftsContent(@Path("community_id") String communityId, @Path("draft_id") String draftId);
+
     /**
      * 获取收藏的社区文章列表
      */
diff --git a/app/src/main/res/layout/community_article_draft_item.xml b/app/src/main/res/layout/community_article_draft_item.xml
index b9ae75d102..a9c9e45a6c 100644
--- a/app/src/main/res/layout/community_article_draft_item.xml
+++ b/app/src/main/res/layout/community_article_draft_item.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout >
 
+    <data>
+        <variable
+            name = "data"
+            type = "com.gh.gamecenter.qa.entity.ArticleDraftEntity"/>
+    </data>
     <RelativeLayout xmlns:android = "http://schemas.android.com/apk/res/android"
         android:id = "@+id/ask_questions_new_item"
         android:layout_width = "match_parent"
@@ -19,7 +24,8 @@
             android:maxLines = "2"
             android:textColor = "@color/black"
             android:textSize = "15sp"
-            android:textStyle = "bold" />
+            android:textStyle = "bold"
+            android:text="@{data.title}"/>
 
         <TextView
             android:id = "@+id/article_draft_time"
diff --git a/app/src/main/res/layout/community_article_item.xml b/app/src/main/res/layout/community_article_item.xml
index b83b371194..b613f1797f 100644
--- a/app/src/main/res/layout/community_article_item.xml
+++ b/app/src/main/res/layout/community_article_item.xml
@@ -16,7 +16,7 @@
         android:paddingBottom = "10dp"
         android:paddingLeft = "20dp"
         android:paddingRight = "20dp"
-        android:paddingTop = "5dp" >
+        android:paddingTop = "10dp" >
 
         <TextView
             android:id = "@+id/article_item_title"
@@ -61,7 +61,7 @@
             android:layout_marginTop = "10dp"
             android:textColor = "@color/hint"
             android:textSize = "11sp"
-            android:text="@{data.count.vote}"
+            android:text="@{data.count.vote + `赞同`}"
             app:layout_constraintTop_toBottomOf = "@id/article_item_img" />
 
         <TextView
@@ -72,7 +72,7 @@
             android:layout_marginTop = "10dp"
             android:textColor = "@color/hint"
             android:textSize = "11sp"
-            android:text="@{data.count.comment}"
+            android:text="@{data.count.comment + `评论`}"
             app:layout_constraintLeft_toRightOf = "@id/article_item_vote_count"
             app:layout_constraintTop_toBottomOf = "@id/article_item_img" />