diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java
index 1a305cb603..206c853122 100644
--- a/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java
+++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java
@@ -77,8 +77,8 @@ public abstract class BaseFragment_TabLayout extends NormalFragment implements V
         mTabIndicatorView.setupWithTabLayout(mTabLayout);
         mTabIndicatorView.setupWithViewPager(mViewPager);
         mTabIndicatorView.setIndicatorWidth(provideIndicatorWidth());
-//        if (getArguments() != null) mCheckedIndex = getArguments().getInt(PAGE_INDEX, 0);
-        mBaseHandler.postDelayed(() -> onPageSelected(mCheckedIndex), 500);
+        if (getArguments() != null) mCheckedIndex = getArguments().getInt(PAGE_INDEX, 0);
+        mBaseHandler.postDelayed(() -> mViewPager.setCurrentItem(mCheckedIndex), 500);
 
         for (int i = 0; i < mTabLayout.getTabCount(); i++) {
             TabLayout.Tab tab = mTabLayout.getTabAt(i);
diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index 5f8b6218aa..ba56bd7652 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -327,7 +327,7 @@ public class DialogUtils {
     public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfirmListener listener) {
         //TODO fix this
         if (!(context instanceof Activity)) {
-            return ;
+            return;
         }
         showWarningDialog(context, title, msg, "取消", "确定", listener, null);
     }
@@ -525,7 +525,7 @@ public class DialogUtils {
             @Override
             public void onCancel(DialogInterface dialogInterface) {
                 if (clListener != null)
-                clListener.onCancel();
+                    clListener.onCancel();
             }
         });
         dialog.show();
@@ -671,6 +671,44 @@ public class DialogUtils {
 
     }
 
+    public static void showSignDialog(Context context, String title, CharSequence message, CharSequence message2
+            , String positive, final ConfirmListener cmListener) {
+        final Dialog dialog = new Dialog(context);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_sign, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+        TextView content2Tv = contentView.findViewById(R.id.dialog_content2);
+
+        contentTv.setText(Html.fromHtml(message.toString()));
+        content2Tv.setText(Html.fromHtml(message2.toString()));
+        titleTv.setText(title);
+        positiveTv.setText(positive);
+
+        negativeTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dialog.dismiss();
+            }
+        });
+
+        positiveTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (cmListener != null) {
+                    cmListener.onConfirm();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+    }
+
     public interface ConfirmListener {
         void onConfirm();
     }
diff --git a/app/src/main/java/com/gh/common/util/LoginUtils.java b/app/src/main/java/com/gh/common/util/LoginUtils.java
index 809d7fd3cb..9f349d78a2 100644
--- a/app/src/main/java/com/gh/common/util/LoginUtils.java
+++ b/app/src/main/java/com/gh/common/util/LoginUtils.java
@@ -188,7 +188,7 @@ public class LoginUtils {
         try {
             JSONObject detail = content.getJSONObject("detail");
             if ("isv.BUSINESS_LIMIT_CONTROL".equals(detail.getString("sub_code"))) {
-                Utils.toast(context, "获取验证码已超过次数，请稍后再试");
+                Utils.toast(context, "获取验证码太频繁，请稍后再试");
             } else {
                 Utils.toast(context, detail.getString("sub_msg"));
             }
@@ -333,10 +333,10 @@ public class LoginUtils {
                 Utils.toast(context, "昵称违规");
                 break;
             case 403801:
-                Utils.toast(context, "获取验证码已超过次数，请稍后再试");
+                Utils.toast(context, "获取验证码太频繁，请稍后再试");
                 break;
             case 403204:
-                Utils.toast(context, "获取验证码已超过次数，请稍后再试");
+                Utils.toast(context, "获取验证码太频繁，请稍后再试");
                 break;
             default:
                 Utils.toast(context, code + "");
diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
index b728e17b70..7229296ff9 100644
--- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.gh.base.fragment.BaseFragment_ViewPager;
+import com.gh.base.fragment.BaseFragment_TabLayout;
 import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.download.DownloadFragment;
 
@@ -42,7 +42,7 @@ public class DownloadManagerActivity extends NormalActivity {
 //        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-        bundle.putInt(BaseFragment_ViewPager.ARGS_INDEX, position);
+        bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, position);
         return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java
index 75e468840e..fbebc8a22e 100644
--- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java
@@ -17,6 +17,9 @@ import android.widget.TextView;
 import com.gh.base.BaseActivity;
 import com.gh.gamecenter.normal.NormalFragment;
 import com.gh.gamecenter.normal.ToolbarController;
+import com.lightgame.OnTitleClickListener;
+
+import java.util.List;
 
 import butterknife.BindView;
 
@@ -71,7 +74,6 @@ public abstract class NormalActivity extends BaseActivity implements ToolbarCont
     }
 
 
-
     @Override
     protected int getLayoutId() {
         return R.layout.activity_normal;
@@ -97,6 +99,14 @@ public abstract class NormalActivity extends BaseActivity implements ToolbarCont
                 onBackPressed();
             }
         });
+        mNormalTitle.setOnClickListener(view -> {
+            final List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
+            for (Fragment fragment : fragmentList) {
+                if (fragment instanceof OnTitleClickListener) {
+                    ((OnTitleClickListener) fragment).onTitleClick();
+                }
+            }
+        });
     }
 
     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java
index a072586d20..9245f55c84 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java
@@ -12,12 +12,13 @@ import android.widget.TextView;
 
 import com.gh.base.OnRequestCallBackListener;
 import com.gh.common.util.ImageUtils;
+import com.gh.common.util.UrlFilterUtils;
 import com.gh.gamecenter.NewsDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
-import com.gh.gamecenter.adapter.viewholder.LibaoSearchViewHolder;
+import com.gh.gamecenter.adapter.viewholder.SearchViewHolder;
 import com.gh.gamecenter.adapter.viewholder.ToolBoxViewHolder;
 import com.gh.gamecenter.entity.ToolBoxEntity;
 import com.gh.gamecenter.manager.UserManager;
@@ -31,7 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import retrofit2.HttpException;
-import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -78,9 +78,8 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
             return;
         }
         mIsLoading = true;
-        Observable<List<ToolBoxEntity>> api;
-        api = RetrofitManager.getInstance(mContext).getApi().getToolKitData(mPage, mSearchKey);
-        api
+        RetrofitManager.getInstance(mContext).getApi()
+                .getToolKitData(mPage, UrlFilterUtils.getFilterQuery("keyword", mIsSearch ? mSearchKey : ""))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<List<ToolBoxEntity>>() {
@@ -154,8 +153,8 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         if (viewType == 0) {
-            View view = mLayoutInflater.inflate(R.layout.libao_item_search, parent, false);
-            return new LibaoSearchViewHolder(view);
+            View view = mLayoutInflater.inflate(R.layout.layout_search_bar, parent, false);
+            return new SearchViewHolder(view);
         } else if (viewType == 1) {
             View view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false);
             return new FooterViewHolder(view);
@@ -175,8 +174,8 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
         } else if (holder instanceof FooterViewHolder) {
             FooterViewHolder viewHolder = (FooterViewHolder) holder;
             initFooterViewHolder(viewHolder, position);
-        } else if (holder instanceof LibaoSearchViewHolder) {
-            LibaoSearchViewHolder viewHolder = (LibaoSearchViewHolder) holder;
+        } else if (holder instanceof SearchViewHolder) {
+            SearchViewHolder viewHolder = (SearchViewHolder) holder;
             initSearchViewHolder(viewHolder);
         }
     }
@@ -191,7 +190,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
 
     }
 
-    private void initSearchViewHolder(final LibaoSearchViewHolder viewHolder) {
+    private void initSearchViewHolder(final SearchViewHolder viewHolder) {
 
         if (mSearchKey != null) {
             viewHolder.searchEt.setText(mSearchKey);
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoSearchViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchViewHolder.java
similarity index 64%
rename from app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoSearchViewHolder.java
rename to app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchViewHolder.java
index f82d748a2e..bf18cb4653 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoSearchViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchViewHolder.java
@@ -12,16 +12,16 @@ import butterknife.BindView;
 /**
  * Created by khy on 2016/12/26.
  */
-public class LibaoSearchViewHolder extends BaseRecyclerViewHolder {
+public class SearchViewHolder extends BaseRecyclerViewHolder {
 
-    @BindView(R.id.libao_et_search)
+    @BindView(R.id.et_search)
     public EditText searchEt;
-    @BindView(R.id.libao_tv_search)
+    @BindView(R.id.tv_search)
     public TextView searchTv;
-    @BindView(R.id.libao_tv_back)
+    @BindView(R.id.tv_back)
     public TextView backTv;
 
-    public LibaoSearchViewHolder(View itemView) {
+    public SearchViewHolder(View itemView) {
         super(itemView);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java
index 20a937b563..8935fdeeae 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java
@@ -32,6 +32,8 @@ import com.lightgame.utils.Utils;
 
 import org.json.JSONObject;
 
+import java.util.Iterator;
+
 import butterknife.BindView;
 import butterknife.OnClick;
 import butterknife.Optional;
@@ -79,6 +81,14 @@ public class AnswerCommentFragment extends ListFragment<CommentEntity, AnswerCom
                 if (exception.code() == 403) {
                     try {
                         JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
+                        Iterator<String> keys = errorJson.keys();
+                        while (keys.hasNext()) { // todo 叫后端统一 code/detail
+                            String key = keys.next();
+                            if (key.equals("detail") && "user banned".equals(errorJson.getString(key))) {
+                                toast(R.string.comment_failed_userblocked);
+                                return;
+                            }
+                        }
                         int errorCode = errorJson.getInt("code");
                         switch (errorCode) {
                             case 403018:
diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java
index eb1fca3d53..1bc207783c 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java
@@ -322,7 +322,8 @@ public class AnswerDetailFragment extends NormalFragment {
                     editContent();
                 } else {
                     // 跳转意见反馈
-                    SuggestionActivity.startSuggestionActivity(getContext(), 1, "report", "问题举报：");
+                    SuggestionActivity.startSuggestionActivity(getContext(), 1, "report",
+                            "回答举报：（" + mAnswerId + "）");
                 }
             });
             item2.setOnClickListener(v -> {
@@ -454,9 +455,9 @@ public class AnswerDetailFragment extends NormalFragment {
         }
 
         if (mDetailEntity.getPublishTime() == mDetailEntity.getUpdateTime()) {
-            mTime.setText(String.format("发布于 %s", NewsUtils.getFormattedTime(mDetailEntity.getPublishTime())));
+            mTime.setText(String.format("发布于 %s\n著作权归作者所有@光环助手", NewsUtils.getFormattedTime(mDetailEntity.getPublishTime())));
         } else {
-            mTime.setText(String.format("编辑于 %s", NewsUtils.getFormattedTime(mDetailEntity.getUpdateTime())));
+            mTime.setText(String.format("编辑于 %s\n著作权归作者所有@光环助手", NewsUtils.getFormattedTime(mDetailEntity.getUpdateTime())));
         }
 
         mAnswerCommentCountTv.setText(String.format("%d 评论", mDetailEntity.getCommentCount()));
diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java
index ec89ac773e..83185757bd 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java
@@ -1,11 +1,13 @@
 package com.gh.gamecenter.ask;
 
 import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
+import android.widget.RadioButton;
 
 import com.gh.base.OnListClickListener;
 import com.gh.common.constant.ItemViewType;
@@ -34,8 +36,11 @@ public class AskQuestionsRecommendsAdapter extends ListAdapter<AnswerEntity> {
     private ProgressBar mSubjectProgressBar;
     private ViewPager mSubjectViewPager;
 
+    private int mWidth;
+
     public AskQuestionsRecommendsAdapter(Context context, OnListClickListener listClickListener, OnSubjectProgressListener progressListener) {
         super(context);
+        mWidth = context.getResources().getDisplayMetrics().widthPixels;
         mProgressListener = progressListener;
         mListClickListener = listClickListener;
     }
@@ -90,8 +95,17 @@ public class AskQuestionsRecommendsAdapter extends ListAdapter<AnswerEntity> {
         switch (getItemViewType(position)) {
             case ItemViewType.ITEM_TOP:
                 AskSubjectViewHolder subjectViewHolder = (AskSubjectViewHolder) holder;
-                subjectViewHolder.mSubjectProgress.setMax(MAX_PROGRESS);
-                mSubjectProgressBar = subjectViewHolder.mSubjectProgress;
+                subjectViewHolder.mSubjectRG.removeAllViews();
+                int size = mSubjectEntity.size();
+                for (int i = 0; i < size; i++) {
+                    RadioButton radioButton = new RadioButton(mContext);
+                    radioButton.setButtonDrawable(new ColorDrawable(0));
+                    radioButton.setBackgroundResource(R.drawable.ask_recommends_vp_selector);
+                    ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(mWidth / size, ViewGroup.LayoutParams.MATCH_PARENT);
+                    subjectViewHolder.mSubjectRG.addView(radioButton, i, params);
+                    if (i == 0) radioButton.setChecked(true);
+                }
+
                 mSubjectViewPager = subjectViewHolder.mSubjectViewPager;
                 if (subjectViewHolder.mSubjectViewPager.getAdapter() == null) {
                     subjectViewHolder.mSubjectViewPager.setAdapter(new AskSubjectPageAdapter(mContext, mSubjectEntity));
@@ -104,6 +118,10 @@ public class AskQuestionsRecommendsAdapter extends ListAdapter<AnswerEntity> {
 
                         @Override
                         public void onPageSelected(int position) {
+                            View view = subjectViewHolder.mSubjectRG.getChildAt(position % size);
+                            if (view instanceof RadioButton) {
+                                ((RadioButton) view).setChecked(true);
+                            }
                             mProgressListener.onStartProgress(); // 每次滑动完成重新启动进度条
                         }
 
diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java
index 4a347a3eaf..d94c0da196 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.widget.TextView;
 
 import com.gh.common.util.AskLogUtils;
 import com.gh.common.util.CheckLoginUtils;
@@ -36,6 +37,8 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
 
     @BindView(R.id.reuse_nodata_skip_tv_btn)
     View mSkipHint;
+    @BindView(R.id.refresh_hint)
+    TextView mRefreshHint;
 
     private AskQuestionsRecommendsAdapter mAdapter;
 
@@ -53,6 +56,8 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
                 message.arg1 = arg1;
                 mBaseHandler.sendMessageDelayed(message, 10); // 因为过程会阻塞，只能取个大致的延迟值
             }
+        } else if (msg.what == 1) {
+            mRefreshHint.setVisibility(View.GONE);
         }
     }
 
@@ -67,13 +72,18 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
             if (integer != null) {
                 switch (integer) {
                     case 0:
-                        toast("已经没有新内容咯，请稍后再试");
+                        mRefreshHint.setText("已经没有新内容咯，请稍后再试");
+                        mRefreshHint.setVisibility(View.VISIBLE);
+                        mBaseHandler.sendEmptyMessageDelayed(1, 2000);
+                        AskLogUtils.communityRefresh(getContext(), integer);
                         break;
                     case -1:
                         toast("获取失败，请检查网络设置");
                         break;
                     default:
-                        toast("成功获取" + integer + "条新内容");
+                        mRefreshHint.setText("成功获取" + integer + "条内容");
+                        mRefreshHint.setVisibility(View.VISIBLE);
+                        mBaseHandler.sendEmptyMessageDelayed(1, 2000);
                         AskLogUtils.communityRefresh(getContext(), integer);
                         break;
 
@@ -123,7 +133,7 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
             mReuseNoData.setVisibility(View.GONE);
             mListLoading.setVisibility(View.VISIBLE);
             mListRv.setVisibility(View.GONE);
-            mListViewModel.load(LoadType.RETRY);
+            mListViewModel.load(null);
         }
     }
 
@@ -141,7 +151,6 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
     @Override
     public void onListClick(View view, int position, Object data) {
         AnswerEntity answerEntity;
-        Bundle bundle;
         switch (view.getId()) {
             case R.id.footerview_item:
                 if (mAdapter.isNetworkError()) {
diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsViewModel.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsViewModel.java
index 987da1333b..dae1f40d01 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsViewModel.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsViewModel.java
@@ -92,7 +92,7 @@ public class AskQuestionsRecommendsViewModel extends ListViewModel<AnswerEntity,
                         if (response.size() == 0) return; // 不需要添加 页面由LoadStatus控制刷新
 
                         List<AnswerEntity> previousData = mLiveData.getValue();
-                        if (previousData == null) {
+                        if (previousData == null || TextUtils.isEmpty(sequenceId)) {
                             previousData = new ArrayList<>();
                         }
 
@@ -137,11 +137,9 @@ public class AskQuestionsRecommendsViewModel extends ListViewModel<AnswerEntity,
     @Override
     public void load(LoadType loadType) {
         List<AnswerEntity> value = mLiveData.getValue();
-        if (loadType == LoadType.RETRY) {
-            loadAskSubjectColumn();
-        } else if (loadType == LoadType.REFRESH && value != null && value.size() > 0) {
-            loadData(true, mLiveData.getValue().get(0).getSequenceId());
-        } else if (value != null && value.size() > 0) {
+        if (loadType == LoadType.REFRESH && value != null && value.size() > 0) {
+            loadData(true, value.get(0).getSequenceId());
+        } else if (value != null && value.size() > 0 && (LoadType.RETRY == loadType || LoadType.NORMAL == loadType)) {
             loadData(false, value.get(value.size() - 1).getSequenceId());
         } else {
             loadAskSubjectColumn();
diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java b/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java
index fd62d67c7b..cd28cadf51 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java
@@ -2,7 +2,7 @@ package com.gh.gamecenter.ask;
 
 import android.support.v4.view.ViewPager;
 import android.view.View;
-import android.widget.ProgressBar;
+import android.widget.RadioGroup;
 
 import com.gh.base.BaseRecyclerViewHolder;
 import com.gh.gamecenter.R;
@@ -18,8 +18,8 @@ public class AskSubjectViewHolder extends BaseRecyclerViewHolder<AskSubjectEntit
 
     @BindView(R.id.ask_recommends_subject_vp)
     ViewPager mSubjectViewPager;
-    @BindView(R.id.ask_recommends_subject_pb)
-    ProgressBar mSubjectProgress;
+    @BindView(R.id.ask_recommends_subject_rg)
+    RadioGroup mSubjectRG;
 
     public AskSubjectViewHolder(View view) {
         super(view);
diff --git a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java
index fd78161272..b2578f1c3a 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java
@@ -41,6 +41,7 @@ import com.gh.common.util.GsonUtils;
 import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LoginUtils;
 import com.gh.common.util.NetworkUtils;
+import com.gh.common.util.UrlFilterUtils;
 import com.gh.gamecenter.QuestionsDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.ask.entity.QuestionsDetailEntity;
@@ -231,7 +232,7 @@ public class QuestionsEditFragment extends NormalFragment {
                     String newText = s.toString().substring(0, QUESTION_TITLE_MAX_LENGTH);
                     mTitle.setText(newText);
                     mTitle.setSelection(mTitle.getText().length());
-                    Utils.toast(getContext(), "标题字数已超过50个字");
+                    Utils.toast(getContext(), "标题最多50个字");
                 }
 
             }
@@ -454,7 +455,7 @@ public class QuestionsEditFragment extends NormalFragment {
     }
 
     private void showEditBackDialog() {
-        DialogUtils.showCancelAlertDialog(getActivity(), "提示", "确定放弃提问吗？"
+        DialogUtils.showCancelAlertDialog(getActivity(), "提示", "确定放弃编辑吗？？"
                 , "再想想", " 放弃", null, () -> {
                     if (getActivity() != null) getActivity().finish();
                 });
@@ -463,7 +464,8 @@ public class QuestionsEditFragment extends NormalFragment {
     private void addTagByTitle() {
         RetrofitManager.getInstance(getContext())
                 .getApi()
-                .getQuestionTagsByTitle(UserManager.getInstance().getCommunityId(getContext()), mTitle.getText().toString())
+                .getQuestionTagsByTitle(UserManager.getInstance().getCommunityId(getContext())
+                        , UrlFilterUtils.getFilterQuery("title", mTitle.getText().toString()))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<List<String>>() {
@@ -535,6 +537,7 @@ public class QuestionsEditFragment extends NormalFragment {
 
 
     private void showAddTagDialog() {
+        mTagDialog.hide();
         final Dialog dialog = new Dialog(getContext());
 
         View view = View.inflate(getContext(), R.layout.dialog_modify_nickname, null);
@@ -584,7 +587,10 @@ public class QuestionsEditFragment extends NormalFragment {
             dialog.dismiss();
         });
 
-        dialog.setOnDismissListener(dialog1 -> Util_System_Keyboard.hideSoftKeyboard(getActivity()));
+        dialog.setOnDismissListener(dialog1 -> {
+            Util_System_Keyboard.hideSoftKeyboard(getActivity());
+            mTagDialog.show();
+        });
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(view);
diff --git a/app/src/main/java/com/gh/gamecenter/ask/entity/QuestionsDetailEntity.kt b/app/src/main/java/com/gh/gamecenter/ask/entity/QuestionsDetailEntity.kt
index 4e8c39b993..9d637d1e2d 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/entity/QuestionsDetailEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/ask/entity/QuestionsDetailEntity.kt
@@ -32,6 +32,9 @@ class QuestionsDetailEntity() : Parcelable {
 
     var me: MeEntity = MeEntity()
 
+    @SerializedName("follow_count")
+    var followCount: String? = null
+
     constructor(parcel: Parcel) : this() {
         id = parcel.readString()
         tags = parcel.createStringArrayList()
@@ -43,6 +46,7 @@ class QuestionsDetailEntity() : Parcelable {
         communityName = parcel.readString()
         isExistDrafts = parcel.readByte() != 0.toByte()
         me = parcel.readParcelable(MeEntity::class.java.classLoader)
+        followCount = parcel.readString()
     }
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
@@ -56,6 +60,7 @@ class QuestionsDetailEntity() : Parcelable {
         parcel.writeString(communityName)
         parcel.writeByte(if (isExistDrafts) 1 else 0)
         parcel.writeParcelable(me, flags)
+        parcel.writeString(followCount)
     }
 
     override fun describeContents(): Int {
diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java
index 19f29f3014..fa889dfacf 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java
@@ -1,6 +1,7 @@
 package com.gh.gamecenter.ask.questionsdetail;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.StringRes;
 import android.support.v4.content.ContextCompat;
@@ -10,7 +11,6 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -217,8 +217,23 @@ public class QuestionsDetailAdapter extends ListAdapter<AnswerEntity> {
             setAnswerTv(holder.answerTv, R.string.question_detail_answer);
         }
 
+        if (mQuestionsDetailEntity.getMe().isQuestionOwn()) {
+            holder.concern.setBackgroundResource(R.drawable.questions_detail_tag_bg);
+            holder.concern.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
+            holder.concern.setText("编辑问题");
+        } else if (mQuestionsDetailEntity.getMe().isQuestionFollowed()) {
+            holder.concern.setBackgroundResource(R.drawable.questions_detail_tag_bg);
+            holder.concern.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
+            holder.concern.setText("已关注");
+        } else {
+            holder.concern.setBackgroundResource(R.drawable.button_normal_style);
+            holder.concern.setTextColor(Color.WHITE);
+            holder.concern.setText("关注问题");
+        }
+
         holder.mTitle.setText(mQuestionsDetailEntity.getTitle());
         holder.mAnswercount.setText(mContext.getString(R.string.ask_answer_count, mQuestionsDetailEntity.getAnswersCount()));
+        holder.concernCount.setText(mQuestionsDetailEntity.getFollowCount() + "人关注");
 
         holder.mDesAll.setOnClickListener((v) -> {
             mIsExpand = true;
@@ -227,13 +242,6 @@ public class QuestionsDetailAdapter extends ListAdapter<AnswerEntity> {
             holder.mDes.setText(mQuestionsDetailEntity.getDescription());
         });
 
-
-        holder.mDes.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-
-            }
-        });
     }
 
     private void addTag(FlexboxLayout mTagRl, String tag) {
@@ -244,7 +252,7 @@ public class QuestionsDetailAdapter extends ListAdapter<AnswerEntity> {
         tagTv.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
         FlexboxLayout.LayoutParams params = new FlexboxLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0, DisplayUtils.dip2px(mContext, 5), DisplayUtils.dip2px(mContext, 15),
+        params.setMargins(0, DisplayUtils.dip2px(mContext, 5), DisplayUtils.dip2px(mContext, 8),
                 DisplayUtils.dip2px(mContext, 5));
         tagTv.setLayoutParams(params);
         mTagRl.addView(view);
diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java
index 21a3def1db..0185d591e8 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java
@@ -72,8 +72,6 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
     @BindView(R.id.reuse_tv_none_data)
     TextView mNoDataTv;
 
-    private MenuItem mQuestionConcern;
-
     private QuestionsDetailAdapter mAdapter;
 
     private QuestionsDetailEntity mQuestionsDetailEntity;
@@ -125,7 +123,6 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
         super.onActivityCreated(savedInstanceState);
         setNavigationTitle("光环助手 - 问题详情");
         initMenu(R.menu.menu_questions_detail);
-        mQuestionConcern = getItemMenu(R.id.menu_question_concern);
     }
 
     @Override
@@ -190,9 +187,7 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
             case R.id.ask_answer_item_img:
             case R.id.ask_answer_item_content:
             case R.id.ask_answer_item_title:
-
                 AnswerEntity entity = (AnswerEntity) data;
-
                 startActivityForResult(AnswerDetailActivity.getIntent(getContext(), entity.getId(), mEntrance + "+(问题详情)")
                         , QUESTIONS_DETAIL_ANSWER_REQUEST);
                 break;
@@ -224,27 +219,17 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
             case R.id.questionsdetail_invite:
                 startActivity(QuestionsInviteActivity.getIntent(getContext(), mQuestionsDetailEntity));
                 break;
-
-        }
-    }
-
-
-    @Override
-    public void onMenuItemClick(MenuItem menuItem) {
-        if (mQuestionsDetailEntity == null) return;
-        switch (menuItem.getItemId()) {
-            case R.id.menu_more:
-                showMoreItemDialog();
-                break;
-            case R.id.menu_question_concern:
+            case R.id.questionsdetail_concern:
                 CheckLoginUtils.checkLogin(getContext(), () -> {
-                    if (!mQuestionsDetailEntity.getMe().isQuestionFollowed()) {
+                    if (mQuestionsDetailEntity.getMe().isQuestionOwn()) {
+                        startActivityForResult(QuestionEditActivity.getIntent(getContext(), mQuestionsDetailEntity), QUESTIONS_EDIT_REQUEST);
+                    } else if (!mQuestionsDetailEntity.getMe().isQuestionFollowed()) {
                         ConcernUtils.INSTANCE.postConcernQuestions(getContext(), mQuestionsId
                                 , new ConcernUtils.onConcernListener() {
                                     @Override
                                     public void onSuccess() {
                                         mQuestionsDetailEntity.getMe().setQuestionFollowed(true);
-                                        mQuestionConcern.setIcon(R.drawable.menu_ic_question_concern_select);
+                                        mAdapter.notifyItemChanged(0);
                                         toast("已关注 ");
                                     }
 
@@ -259,7 +244,7 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
                                     @Override
                                     public void onSuccess() {
                                         mQuestionsDetailEntity.getMe().setQuestionFollowed(false);
-                                        mQuestionConcern.setIcon(R.drawable.menu_ic_question_concern_unselect);
+                                        mAdapter.notifyItemChanged(0);
                                         toast("取消关注");
                                     }
 
@@ -271,6 +256,18 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
                     }
                 });
                 break;
+
+        }
+    }
+
+
+    @Override
+    public void onMenuItemClick(MenuItem menuItem) {
+        if (mQuestionsDetailEntity == null) return;
+        switch (menuItem.getItemId()) {
+            case R.id.menu_more:
+                showMoreItemDialog();
+                break;
         }
     }
 
@@ -292,7 +289,7 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
             dialog.show();
             ImageView icon = view.findViewById(R.id.more_item_icon1);
             TextView title = view.findViewById(R.id.more_item_title1);
-            if (mQuestionsDetailEntity.getMe().isQuestionOwn()) {
+            if (mQuestionsDetailEntity.getMe().isQuestionOwn() && false) {
                 icon.setImageResource(R.drawable.menu_more_edit);
                 title.setText("编辑");
             }
@@ -304,7 +301,8 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
                     startActivityForResult(QuestionEditActivity.getIntent(getContext(), mQuestionsDetailEntity), QUESTIONS_EDIT_REQUEST);
                 } else {
                     // 跳转意见反馈
-                    SuggestionActivity.startSuggestionActivity(getContext(), 1, "report", "问题举报：");
+                    SuggestionActivity.startSuggestionActivity(getContext(), 1, "report",
+                            "问题举报（" + mQuestionsDetailEntity.getId() + "）：");
                 }
             });
             item2.setOnClickListener(v -> {
@@ -357,11 +355,6 @@ public class QuestionsDetailFragment extends ListFragment<AnswerEntity, NormalLi
                         if (TextUtils.isEmpty(response.getMe().getMyAnswerId())) {
                             getUserAnswerDrafts();
                         }
-                        if (response.getMe().isQuestionFollowed()) {
-                            mQuestionConcern.setIcon(R.drawable.menu_ic_question_concern_select);
-                        } else {
-                            mQuestionConcern.setIcon(R.drawable.menu_ic_question_concern_unselect);
-                        }
                         response.setId(mQuestionsId);
                         mQuestionsDetailEntity = response;
                         mAdapter.setQuestionsEntity(response);
diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java
index 34c8960970..9ec6c7a9f6 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java
@@ -44,6 +44,10 @@ public class QuestionsDetailItemViewHolder extends BaseRecyclerViewHolder {
     View answerBtn;
     @BindView(R.id.questionsdetail_invite)
     View inviteBtn;
+    @BindView(R.id.questionsdetail_concern)
+    TextView concern;
+    @BindView(R.id.questionsdetail_concern_count)
+    TextView concernCount;
 
     public QuestionsDetailItemViewHolder(View itemView, OnListClickListener listClickListener) {
         super(itemView, listClickListener);
@@ -52,5 +56,6 @@ public class QuestionsDetailItemViewHolder extends BaseRecyclerViewHolder {
         mPic3.setOnClickListener(this);
         answerBtn.setOnClickListener(this);
         inviteBtn.setOnClickListener(this);
+        concern.setOnClickListener(this);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteWrapperFragment.java
index 3b653c8017..8a704e7e4c 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteWrapperFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteWrapperFragment.java
@@ -34,11 +34,11 @@ public class QuestionsInviteWrapperFragment extends NormalFragment {
 
     @BindView(R.id.invite_appbar)
     AppBarLayout mAppBar;
-    @BindView(R.id.invite_et_search)
+    @BindView(R.id.et_search)
     EditText mInviteEtSearch;
-    @BindView(R.id.invite_tv_back)
+    @BindView(R.id.tv_back)
     TextView mInviteTvBack;
-    @BindView(R.id.invite_tv_search)
+    @BindView(R.id.tv_search)
     TextView mInviteTvSearch;
 
     private final static String INVITE_SEARCH_TAG = "INVITE_SEARCH_TAG";
@@ -94,7 +94,7 @@ public class QuestionsInviteWrapperFragment extends NormalFragment {
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        setNavigationTitle("达人推荐");
+        setNavigationTitle("邀请回答");
         initMenu(R.menu.menu_question_invite);
     }
 
@@ -156,13 +156,13 @@ public class QuestionsInviteWrapperFragment extends NormalFragment {
         return fragmentByTag;
     }
 
-    @OnClick({R.id.invite_tv_back, R.id.invite_tv_search})
+    @OnClick({R.id.tv_back, R.id.tv_search})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.invite_tv_back:
+            case R.id.tv_back:
                 mIsSearch = false;
                 break;
-            case R.id.invite_tv_search:
+            case R.id.tv_search:
                 String key = mInviteEtSearch.getText().toString();
                 if (TextUtils.isEmpty(key)) {
                     toast(R.string.search_hint);
diff --git a/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectAdapter.java
index 9f12ca1c60..109a70fddc 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectAdapter.java
@@ -10,9 +10,9 @@ import com.gh.base.OnListClickListener;
 import com.gh.common.constant.ItemViewType;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
+import com.gh.gamecenter.ask.AskQuestionsRecommendsViewHolder;
 import com.gh.gamecenter.ask.entity.AnswerEntity;
 import com.gh.gamecenter.ask.entity.AskSubjectEntity;
-import com.gh.gamecenter.ask.questionsdetail.AnswerViewHolder;
 import com.gh.gamecenter.baselist.ListAdapter;
 import com.gh.gamecenter.databinding.AskSubjectTopItemBinding;
 
@@ -62,8 +62,8 @@ public class AskSubjectAdapter extends ListAdapter<AnswerEntity> {
                 view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false);
                 return new FooterViewHolder(view, mListClickListener);
             case ItemViewType.ITEM_BODY:
-                view = mLayoutInflater.inflate(R.layout.ask_answer_item, parent, false);
-                return new AnswerViewHolder(view, mListClickListener);
+                view = mLayoutInflater.inflate(R.layout.ask_questions_hot_item, parent, false);
+                return new AskQuestionsRecommendsViewHolder(view, mListClickListener);
         }
         return null;
     }
@@ -83,7 +83,7 @@ public class AskSubjectAdapter extends ListAdapter<AnswerEntity> {
             case ItemViewType.ITEM_BODY:
                 int index = position - ListAdapter.TOP_ITEM_COUNT;
                 if (index != -1)
-                    ((AnswerViewHolder) holder).initAnswerViewHolder(mContext, mEntityList.get(index));
+                    ((AskQuestionsRecommendsViewHolder) holder).initQuestionsHotViewHolder(mEntityList.get(index));
                 break;
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java b/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java
index 032bbd9a44..894c17a545 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java
@@ -6,11 +6,14 @@ import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import com.gh.common.util.AskLogUtils;
 import com.gh.common.view.VerticalItemDecoration;
 import com.gh.gamecenter.AnswerDetailActivity;
+import com.gh.gamecenter.QuestionsDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.ask.entity.AnswerEntity;
 import com.gh.gamecenter.ask.entity.AskSubjectEntity;
+import com.gh.gamecenter.ask.entity.Questions;
 import com.gh.gamecenter.baselist.ListAdapter;
 import com.gh.gamecenter.baselist.ListFragment;
 import com.gh.gamecenter.baselist.LoadStatus;
@@ -37,7 +40,7 @@ public class AskSubjectFragment extends ListFragment<AnswerEntity, AskSubjectVie
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        setNavigationTitle("专题详情");
+        setNavigationTitle("问答专题");
     }
 
     @Override
@@ -75,15 +78,23 @@ public class AskSubjectFragment extends ListFragment<AnswerEntity, AskSubjectVie
 
     @Override
     public void onListClick(View view, int position, Object data) {
+        AnswerEntity answerEntity;
         switch (view.getId()) {
             case R.id.footerview_item:
                 if (mAdapter.isNetworkError()) {
                     mListViewModel.load(LoadType.RETRY);
                 }
                 break;
-            case R.id.ask_answer_item_constraintlayout:
-                AnswerEntity answerEntity = (AnswerEntity) data;
-                startActivity(AnswerDetailActivity.getIntent(getContext(), answerEntity.getId(),   "(社区专题)"));
+            case R.id.ask_item_title:
+                String tracers = "(社区专题)";
+                answerEntity = (AnswerEntity) data;
+                Questions questions = answerEntity.getQuestions();
+                startActivity(QuestionsDetailActivity.getIntent(getContext(), questions.getId(), tracers));
+                AskLogUtils.uploadQuestions(getContext(), tracers, questions);
+                break;
+            case R.id.ask_item_constraintlayout:
+                answerEntity = (AnswerEntity) data;
+                startActivity(AnswerDetailActivity.getIntent(getContext(), answerEntity.getId(), "(社区专题)"));
                 break;
         }
 
diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java
index dedac31b3c..efdc45528b 100644
--- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java
@@ -22,7 +22,6 @@ import butterknife.OnClick;
 /**
  * Created by khy on 20/08/17.
  */
-//TODO 改写viewpgerfragment
 public class KaiFuFragment extends BaseFragment {
 
     @BindView(R.id.kaifu_tabbar_today)
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
index 519b361648..53d6a13e4a 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
@@ -36,11 +36,11 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O
     AppBarLayout mAppBar;
     @BindView(R.id.libao_refresh)
     SwipeRefreshLayout mRefreshLayout;
-    @BindView(R.id.libao_et_search)
+    @BindView(R.id.et_search)
     EditText mLibaoEtSearch;
-    @BindView(R.id.libao_tv_back)
+    @BindView(R.id.tv_back)
     TextView mLibaoTvBack;
-    @BindView(R.id.libao_tv_search)
+    @BindView(R.id.tv_search)
     TextView mLibaoTvSearch;
 
     public final static String OPEN_LIBAO_APPBAR = "open_libao_appbar";
@@ -121,13 +121,13 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O
         return fragmentByTag;
     }
 
-    @OnClick({R.id.libao_tv_back, R.id.libao_tv_search})
+    @OnClick({R.id.tv_back, R.id.tv_search})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.libao_tv_back:
+            case R.id.tv_back:
                 mIsSearch = false;
                 break;
-            case R.id.libao_tv_search:
+            case R.id.tv_search:
                 String key = mLibaoEtSearch.getText().toString();
                 if (TextUtils.isEmpty(key)) {
                     toast(R.string.search_hint);
diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java
index 2018234d7a..c6fae3b54d 100644
--- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java
@@ -64,12 +64,13 @@ public class KeFuFragmentAdapter extends ListAdapter<MessageKeFuEntity> {
 
     @Override
     public int getItemCount() {
-        return mEntityList == null ? 0 : mEntityList.size() + FOOTER_ITEM_COUNT;
+        return mEntityList == null || mEntityList.isEmpty() ? 0 : mEntityList.size() + FOOTER_ITEM_COUNT;
     }
 
     private void initKeFuViewHolder(KeFuViewHolder viewHolder, final MessageKeFuEntity keFuEntity) {
 
         viewHolder.content.setText(Html.fromHtml(keFuEntity.getMessage()));
+        viewHolder.setClickData(keFuEntity);
         if (!TextUtils.isEmpty(keFuEntity.getSuggestion())) {
             viewHolder.suggestion.setVisibility(View.VISIBLE);
             viewHolder.suggestion.setText(keFuEntity.getSuggestion());
diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java
index e8bdb333ff..bd666833a5 100644
--- a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java
@@ -7,13 +7,14 @@ import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.base.BaseRecyclerViewHolder;
 import com.gh.base.OnListClickListener;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.entity.MessageKeFuEntity;
 
 import butterknife.BindView;
 
 /**
  * Created by khy on 2017/4/10.
  */
-public class KeFuViewHolder extends BaseRecyclerViewHolder {
+public class KeFuViewHolder extends BaseRecyclerViewHolder<MessageKeFuEntity> {
 
     @BindView(R.id.message_kefu_time)
     public TextView time;
@@ -30,10 +31,6 @@ public class KeFuViewHolder extends BaseRecyclerViewHolder {
     @BindView(R.id.message_kefu_name)
     TextView kefuName;
 
-    public KeFuViewHolder(View itemView) {
-        super(itemView);
-    }
-
     public KeFuViewHolder(View itemView, OnListClickListener listClickListener) {
         super(itemView, listClickListener);
         skip.setOnClickListener(this);
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
index 3ed4617557..1767a7c876 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
@@ -41,7 +41,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
         List<String> images;
         switch (messageEntity.getType()) {
             case "answer":
-                mBinding.messageCommand.setText("回答了我的问题");
+                mBinding.messageCommand.setText("回答了你的问题");
                 mBinding.messageContent.setVisibility(View.VISIBLE);
                 mBinding.messageContent.setText(messageEntity.getAnswer().getContent());
                 mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
@@ -50,14 +50,14 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                     mBinding.messageOriginalIcon.setImageURI(images.get(0));
                 break;
             case "reply":
-                mBinding.messageCommand.setText("回复了我");
+                mBinding.messageCommand.setText("回复了你");
                 mBinding.messageContent.setVisibility(View.VISIBLE);
                 mBinding.messageContent.setText(messageEntity.getDialogue().getTo().getContent());
                 mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle());
                 mBinding.messageOriginalIcon.setImageURI(messageEntity.getArticle().getThumb());
                 break;
             case "follow_question":
-                mBinding.messageCommand.setText("回答了我关注的问题");
+                mBinding.messageCommand.setText("回答了你关注的问题");
                 mBinding.messageContent.setVisibility(View.VISIBLE);
                 mBinding.messageContent.setText(messageEntity.getAnswer().getContent());
                 mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
@@ -66,7 +66,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                     mBinding.messageOriginalIcon.setImageURI(images.get(0));
                 break;
             case "reply_answer_comment":
-                mBinding.messageCommand.setText("回复了我");
+                mBinding.messageCommand.setText("回复了你");
                 mBinding.messageContent.setVisibility(View.VISIBLE);
                 mBinding.messageContent.setText(messageEntity.getDialogue().getTo().getContent());
                 mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
@@ -75,7 +75,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                     mBinding.messageOriginalIcon.setImageURI(images.get(0));
                 break;
             case "answer_comment":
-                mBinding.messageCommand.setText("评论了我");
+                mBinding.messageCommand.setText("评论了你");
                 mBinding.messageContent.setVisibility(View.VISIBLE);
                 mBinding.messageContent.setText(messageEntity.getComment().getContent());
                 mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
@@ -84,7 +84,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                     mBinding.messageOriginalIcon.setImageURI(images.get(0));
                 break;
             case "answer_vote":
-                mBinding.messageCommand.setText("赞同了我的回答");
+                mBinding.messageCommand.setText("赞同了你的回答");
                 mBinding.messageContent.setVisibility(View.GONE);
                 mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
                 images = messageEntity.getAnswer().getImages();
@@ -92,13 +92,13 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                     mBinding.messageOriginalIcon.setImageURI(images.get(0));
                 break;
             case "comment_vote":
-                mBinding.messageCommand.setText("赞了我");
+                mBinding.messageCommand.setText("赞了你");
                 mBinding.messageContent.setVisibility(View.GONE);
                 mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle());
                 mBinding.messageOriginalIcon.setImageURI(messageEntity.getArticle().getThumb());
                 break;
             case "answer_comment_vote":
-                mBinding.messageCommand.setText("赞了我");
+                mBinding.messageCommand.setText("赞了你");
                 mBinding.messageContent.setVisibility(View.GONE);
                 mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
                 images = messageEntity.getAnswer().getImages();
@@ -106,7 +106,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                     mBinding.messageOriginalIcon.setImageURI(images.get(0));
                 break;
             case "invited":
-                mBinding.messageCommand.setText("邀请我回答");
+                mBinding.messageCommand.setText("邀请你回答");
                 mBinding.messageContent.setVisibility(View.GONE);
                 mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
                 images = messageEntity.getQuestion().getImages();
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
index 00835c0378..e0eb0a3698 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
@@ -282,15 +282,22 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
                 .subscribe(new Response<SignEntity>() {
                     @Override
                     public void onResponse(SignEntity signEntity) {
-                        if (isCanSign(signEntity.getLastTime())) { //+10s
-                            DialogUtils.showCancelAlertDialog(getActivity()
-                                    , "签到成功，获得经验：1"
-                                    , "已连续签到" + signEntity.getSerialSign() + "天、累计经验：" + signEntity.getCoefficients()
-                                    , getSignSkipText(signEntity.getData()), " 关闭", () -> signSkip(signEntity), null);
+                        if (isCanSign(signEntity.getLastTime())) {
+                            DialogUtils.showSignDialog(getContext(), "签到成功，获得经验：1"
+                                    , getString(R.string.sign_dialog_content, signEntity.getSerialSign())
+                                    , getString(R.string.sign_dialog_content2, signEntity.getExperience())
+                                    , getSignSkipText(signEntity.getData()), () -> {
+                                        signSkip(signEntity);
+                                    }
+                            );
                         } else {
-                            DialogUtils.showCancelAlertDialog(getActivity(), "今天已签到，明天再来吧~"
-                                    , "已连续签到" + signEntity.getSerialSign() + "天、累计经验：" + signEntity.getCoefficients()
-                                    , getSignSkipText(signEntity.getData()), " 关闭", () -> signSkip(signEntity), null);
+                            DialogUtils.showSignDialog(getContext(), "今天已签到，明天再来吧~"
+                                    , getString(R.string.sign_dialog_content, signEntity.getSerialSign())
+                                    , getString(R.string.sign_dialog_content2, signEntity.getExperience())
+                                    , getSignSkipText(signEntity.getData()), () -> {
+                                        signSkip(signEntity);
+                                    }
+                            );
                         }
                     }
 
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 e0ceaf3555..7ab9000760 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
@@ -346,7 +346,7 @@ public interface ApiService {
      * 根据关键字获取工具箱信息(搜索)
      */
     @GET("toolkits")
-    Observable<List<ToolBoxEntity>> getToolKitData(@Query("page") int page, @Query("keyword") String keyword);
+    Observable<List<ToolBoxEntity>> getToolKitData(@Query("page") int page, @Query("filter") String filter);
 
 
     /**
diff --git a/app/src/main/res/drawable-xhdpi/kaifu_time_icon.png b/app/src/main/res/drawable-xhdpi/kaifu_time_icon.png
index 6d16126703..ac11fa08e1 100644
Binary files a/app/src/main/res/drawable-xhdpi/kaifu_time_icon.png and b/app/src/main/res/drawable-xhdpi/kaifu_time_icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sign_dialog_bg.png b/app/src/main/res/drawable-xhdpi/sign_dialog_bg.png
new file mode 100644
index 0000000000..65978c6a51
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sign_dialog_bg.png differ
diff --git a/app/src/main/res/drawable/ask_recommends_vp_select.xml b/app/src/main/res/drawable/ask_recommends_vp_select.xml
new file mode 100644
index 0000000000..7bcce540d6
--- /dev/null
+++ b/app/src/main/res/drawable/ask_recommends_vp_select.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android = "http://schemas.android.com/apk/res/android"
+    android:shape = "rectangle" >
+    <solid android:color = "@color/theme" />
+</shape >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ask_recommends_vp_selector.xml b/app/src/main/res/drawable/ask_recommends_vp_selector.xml
new file mode 100644
index 0000000000..77bfaf8099
--- /dev/null
+++ b/app/src/main/res/drawable/ask_recommends_vp_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android = "http://schemas.android.com/apk/res/android" >
+    <item android:drawable = "@drawable/ask_recommends_vp_select" android:state_checked = "true" />
+    <item android:drawable = "@drawable/ask_recommends_vp_select" android:state_checked = "true" />
+    <item android:drawable = "@drawable/ask_recommends_vp_unselect" android:state_checked = "false" />
+</selector >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ask_recommends_vp_unselect.xml b/app/src/main/res/drawable/ask_recommends_vp_unselect.xml
new file mode 100644
index 0000000000..c5e9b1f294
--- /dev/null
+++ b/app/src/main/res/drawable/ask_recommends_vp_unselect.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android = "http://schemas.android.com/apk/res/android"
+    android:shape = "rectangle" >
+    <solid android:color = "@android:color/white" />
+</shape >
\ No newline at end of file
diff --git a/app/src/main/res/layout/ask_recommends_subject.xml b/app/src/main/res/layout/ask_recommends_subject.xml
index 643af1e851..c849a8ef1c 100644
--- a/app/src/main/res/layout/ask_recommends_subject.xml
+++ b/app/src/main/res/layout/ask_recommends_subject.xml
@@ -10,12 +10,12 @@
         android:layout_width = "match_parent"
         android:layout_height = "97dp" />
 
-    <ProgressBar
-        android:id = "@+id/ask_recommends_subject_pb"
-        style = "?android:attr/progressBarStyleHorizontal"
+
+    <RadioGroup
+        android:id = "@+id/ask_recommends_subject_rg"
         android:layout_width = "match_parent"
         android:layout_height = "1dp"
-        android:layout_marginTop = "15dp"
-        android:progressDrawable = "@drawable/ask_subject_pb"
+        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf = "parent" />
+
 </android.support.constraint.ConstraintLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/ask_selectgame_item.xml b/app/src/main/res/layout/ask_selectgame_item.xml
index d886dcb006..4da57d2ca7 100644
--- a/app/src/main/res/layout/ask_selectgame_item.xml
+++ b/app/src/main/res/layout/ask_selectgame_item.xml
@@ -23,18 +23,18 @@
         android:layout_width = "0dp"
         android:layout_height = "wrap_content"
         android:layout_marginLeft = "15dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginRight = "5dp"
         android:textColor = "@color/black"
         android:textSize = "14sp"
         android:textStyle = "bold"
-        app:layout_constraintRight_toLeftOf="@+id/ask_selectgame_item_left"
         app:layout_constraintBottom_toBottomOf = "@id/ask_selectgame_item_constraintlayout"
         app:layout_constraintLeft_toRightOf = "@id/ask_selectgame_item_icon"
+        app:layout_constraintRight_toLeftOf = "@+id/ask_selectgame_item_left"
         app:layout_constraintTop_toTopOf = "@id/ask_selectgame_item_constraintlayout" />
 
 
     <RelativeLayout
-        android:id="@+id/ask_selectgame_item_left"
+        android:id = "@+id/ask_selectgame_item_left"
         android:layout_width = "wrap_content"
         android:layout_height = "wrap_content"
         app:layout_constraintBottom_toBottomOf = "parent"
@@ -68,13 +68,14 @@
                 android:textSize = "11sp" />
         </RelativeLayout >
 
-        <ImageView
+        <TextView
             android:id = "@+id/ask_selectgame_item_selecthint"
             android:layout_width = "wrap_content"
             android:layout_height = "wrap_content"
+            android:text = "当前选择"
             android:textColor = "@color/black"
-            android:src="@drawable/kc_checkbox_select"
-            android:visibility = "gone" />
+            android:textSize = "11sp"
+            android:visibility = "visible" />
 
     </RelativeLayout >
 </android.support.constraint.ConstraintLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/ask_subject_top_item.xml b/app/src/main/res/layout/ask_subject_top_item.xml
index f5bfe98a4e..bd7e722e79 100644
--- a/app/src/main/res/layout/ask_subject_top_item.xml
+++ b/app/src/main/res/layout/ask_subject_top_item.xml
@@ -26,14 +26,14 @@
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
             android:background = "@android:color/white"
+            android:maxLines = "2"
             android:paddingLeft = "20dp"
             android:paddingRight = "20dp"
-            android:paddingTop = "15dp"
+            android:paddingTop = "12dp"
             android:text = "@{entity.title}"
             android:textColor = "@color/black"
             android:textSize = "14sp"
             android:textStyle = "bold"
-            android:maxLines="2"
             app:layout_constraintTop_toBottomOf = "@id/ask_subject_top_icon" />
 
         <TextView
@@ -41,15 +41,14 @@
             android:layout_width = "match_parent"
             android:layout_height = "wrap_content"
             android:background = "@android:color/white"
-            android:paddingBottom = "13dp"
+            android:ellipsize = "end"
+            android:paddingBottom = "12dp"
             android:paddingLeft = "20dp"
             android:paddingRight = "20dp"
-            android:paddingTop = "15dp"
+            android:paddingTop = "9dp"
             android:text = "@{entity.description}"
             android:textColor = "@color/title"
             android:textSize = "13sp"
-            android:maxLines="3"
-            android:ellipsize="end"
             app:layout_constraintTop_toBottomOf = "@id/ask_subject_top_title" />
 
         <TextView
diff --git a/app/src/main/res/layout/dialog_sign.xml b/app/src/main/res/layout/dialog_sign.xml
new file mode 100644
index 0000000000..9605f90a7d
--- /dev/null
+++ b/app/src/main/res/layout/dialog_sign.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
+    android:layout_width = "wrap_content"
+    android:layout_height = "wrap_content"
+    android:background = "@android:color/white"
+    android:orientation = "vertical" >
+
+    <ImageView
+        android:layout_width = "wrap_content"
+        android:layout_height = "wrap_content"
+        android:src = "@drawable/sign_dialog_bg" />
+
+    <TextView
+        android:id = "@+id/dialog_title"
+        android:layout_width = "match_parent"
+        android:layout_height = "wrap_content"
+        android:layout_marginTop = "15dp"
+        android:gravity = "center"
+        android:textColor = "@color/theme"
+        android:textSize = "16dp"
+        android:textStyle = "bold" />
+
+    <TextView
+        android:id = "@+id/dialog_content"
+        android:layout_width = "match_parent"
+        android:layout_height = "wrap_content"
+        android:layout_marginTop = "18dp"
+        android:gravity = "center"
+        android:textColor = "@android:color/black"
+        android:textSize = "14sp" />
+
+    <TextView
+        android:id = "@+id/dialog_content2"
+        android:layout_width = "match_parent"
+        android:layout_height = "wrap_content"
+        android:layout_marginTop = "12dp"
+        android:gravity = "center"
+        android:textColor = "@android:color/black"
+        android:textSize = "14sp" />
+
+    <View
+        android:id = "@+id/questionsdetail_line_top"
+        android:layout_width = "match_parent"
+        android:layout_height = "1dp"
+        android:layout_marginTop = "20dp"
+        android:layout_marginBottom="-1dp"
+        android:background = "@color/cutting_line" />
+
+    <LinearLayout
+        android:layout_width = "match_parent"
+        android:layout_height = "43dp" >
+
+        <TextView
+            android:id = "@+id/dialog_negative"
+            android:layout_width = "0dp"
+            android:layout_height = "match_parent"
+            android:layout_weight = "1"
+            android:gravity = "center"
+            android:text = "关闭"
+            android:textColor = "@color/black"
+            android:textSize = "13sp" />
+
+        <TextView
+            android:id = "@+id/dialog_positive"
+            android:layout_width = "0dp"
+            android:layout_height = "match_parent"
+            android:layout_weight = "1"
+            android:background = "@color/theme"
+            android:gravity = "center"
+            android:textColor = "@android:color/white"
+            android:textSize = "13sp" />
+
+    </LinearLayout >
+
+</LinearLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml
index 9e56ff1cd4..a8d798d735 100644
--- a/app/src/main/res/layout/fragment_answer_detail.xml
+++ b/app/src/main/res/layout/fragment_answer_detail.xml
@@ -174,6 +174,7 @@
                     android:layout_marginTop="10dp"
                     android:textColor="@color/title"
                     android:textSize="14sp"
+                    android:gravity="right"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/answer_detail_Rd" />
 
diff --git a/app/src/main/res/layout/fragment_invite.xml b/app/src/main/res/layout/fragment_invite.xml
index 4cb76af79d..97fd66f4d4 100644
--- a/app/src/main/res/layout/fragment_invite.xml
+++ b/app/src/main/res/layout/fragment_invite.xml
@@ -13,57 +13,7 @@
         android:gravity = "center"
         app:layout_behavior = "com.gh.common.view.FixAppBarLayoutBehavior" >
 
-        <RelativeLayout
-            android:layout_width = "wrap_content"
-            android:layout_height = "38dp"
-            android:layout_marginBottom = "18dp"
-            android:layout_marginLeft = "35dp"
-            android:layout_marginRight = "35dp"
-            android:layout_marginTop = "19dp"
-            android:gravity = "center_vertical"
-            app:layout_scrollFlags = "scroll|enterAlwaysCollapsed" >
-
-            <EditText
-                android:id = "@+id/invite_et_search"
-                android:layout_width = "match_parent"
-                android:layout_height = "match_parent"
-                android:background = "@drawable/libao_search_bg"
-                android:hint = "@string/libao_search_input"
-                android:imeOptions = "actionSearch"
-                android:paddingLeft = "5dp"
-                android:paddingRight = "53dp"
-                android:singleLine = "true"
-                android:textColorHint = "@color/hint"
-                android:textCursorDrawable = "@drawable/cursor_color"
-                android:textSize = "16sp" />
-
-            <TextView
-                android:id = "@+id/invite_tv_back"
-                android:layout_width = "wrap_content"
-                android:layout_height = "match_parent"
-                android:layout_marginBottom = "1dp"
-                android:layout_marginTop = "1dp"
-                android:layout_toLeftOf = "@+id/invite_tv_search"
-                android:background = "@color/dcdcdc"
-                android:gravity = "center"
-                android:paddingLeft = "10dp"
-                android:paddingRight = "10dp"
-                android:text = "@string/libao_back"
-                android:textColor = "@android:color/white"
-                android:visibility = "gone" />
-
-            <TextView
-                android:id = "@+id/invite_tv_search"
-                android:layout_width = "48dp"
-                android:layout_height = "match_parent"
-                android:layout_alignParentRight = "true"
-                android:background = "@drawable/news_search_btn"
-                android:gravity = "center"
-                android:text = "@string/libao_search"
-                android:textColor = "@android:color/white"
-                android:textSize = "14sp" />
-
-        </RelativeLayout >
+        <include layout = "@layout/layout_search_bar" />
 
     </android.support.design.widget.AppBarLayout >
 
diff --git a/app/src/main/res/layout/fragment_libao1.xml b/app/src/main/res/layout/fragment_libao1.xml
index 28a59f5a8d..9f85e878aa 100644
--- a/app/src/main/res/layout/fragment_libao1.xml
+++ b/app/src/main/res/layout/fragment_libao1.xml
@@ -23,58 +23,7 @@
                 android:gravity = "center"
                 app:layout_behavior = "com.gh.common.view.FixAppBarLayoutBehavior" >
 
-                <RelativeLayout
-                    android:layout_width = "wrap_content"
-                    android:layout_height = "38dp"
-                    android:layout_marginBottom = "18dp"
-                    android:layout_marginLeft = "35dp"
-                    android:layout_marginRight = "35dp"
-                    android:layout_marginTop = "19dp"
-                    android:gravity = "center_vertical"
-                    app:layout_scrollFlags = "scroll|enterAlwaysCollapsed" >
-
-                    <EditText
-                        android:id = "@+id/libao_et_search"
-                        android:layout_width = "match_parent"
-                        android:layout_height = "match_parent"
-                        android:background = "@drawable/libao_search_bg"
-                        android:hint = "@string/libao_search_input"
-                        android:imeOptions = "actionSearch"
-                        android:paddingLeft = "5dp"
-                        android:paddingRight = "53dp"
-                        android:singleLine = "true"
-                        android:textColorHint = "@color/hint"
-                        android:textCursorDrawable = "@drawable/cursor_color"
-                        android:textSize = "16sp" />
-
-                    <TextView
-                        android:id = "@+id/libao_tv_back"
-                        android:layout_width = "wrap_content"
-                        android:layout_height = "match_parent"
-                        android:layout_marginBottom = "1dp"
-                        android:layout_marginTop = "1dp"
-                        android:layout_toLeftOf = "@+id/libao_tv_search"
-                        android:background = "@color/dcdcdc"
-                        android:gravity = "center"
-                        android:paddingLeft = "10dp"
-                        android:paddingRight = "10dp"
-                        android:text = "@string/libao_back"
-                        android:textColor = "@android:color/white"
-                        android:visibility = "gone" />
-
-                    <TextView
-                        android:id = "@+id/libao_tv_search"
-                        android:layout_width = "48dp"
-                        android:layout_height = "match_parent"
-                        android:layout_alignParentRight = "true"
-                        android:background = "@drawable/news_search_btn"
-                        android:gravity = "center"
-                        android:text = "@string/libao_search"
-                        android:textColor = "@android:color/white"
-                        android:textSize = "14sp" />
-
-                </RelativeLayout >
-
+                <include layout = "@layout/layout_search_bar" />
             </android.support.design.widget.AppBarLayout >
 
             <FrameLayout
diff --git a/app/src/main/res/layout/fragment_list_nodate_skip.xml b/app/src/main/res/layout/fragment_list_nodate_skip.xml
index 4e8dd6b444..a00f5c9e28 100644
--- a/app/src/main/res/layout/fragment_list_nodate_skip.xml
+++ b/app/src/main/res/layout/fragment_list_nodate_skip.xml
@@ -8,10 +8,28 @@
         android:layout_width = "match_parent"
         android:layout_height = "match_parent" >
 
-        <android.support.v7.widget.RecyclerView
-            android:id = "@+id/list_rv"
-            android:layout_width = "match_parent"
-            android:layout_height = "wrap_content" />
+        <RelativeLayout
+            android:layout_width = "wrap_content"
+            android:layout_height = "wrap_content"
+            android:orientation = "vertical" >
+
+            <android.support.v7.widget.RecyclerView
+                android:id = "@+id/list_rv"
+                android:layout_below="@+id/refresh_hint"
+                android:layout_width = "match_parent"
+                android:layout_height = "wrap_content" />
+
+            <TextView
+                android:id = "@+id/refresh_hint"
+                android:layout_width = "match_parent"
+                android:layout_height = "35dp"
+                android:layout_marginBottom = "-8dp"
+                android:background = "#d6e9f7"
+                android:gravity = "center"
+                android:textColor = "#3a98da"
+                android:textSize = "13sp"
+                android:visibility = "gone" />
+        </RelativeLayout >
     </android.support.v4.widget.SwipeRefreshLayout >
 
     <com.gc.materialdesign.views.ProgressBarCircularIndeterminate
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index 53c5698b4f..e17263c4ee 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -26,7 +26,7 @@
                     android:layout_width = "75dp"
                     android:layout_height = "75dp"
                     android:layout_centerHorizontal = "true"
-                    android:layout_marginTop = "35dp"
+                    android:layout_marginTop = "42dp"
                     fresco:placeholderImage = "@drawable/user_default_icon_comment"
                     fresco:roundAsCircle = "true" />
 
@@ -56,7 +56,7 @@
                 android:layout_width = "match_parent"
                 android:layout_height = "wrap_content"
                 android:background = "@android:color/white"
-                android:paddingTop = "35dp" >
+                android:paddingTop = "30dp" >
 
                 <LinearLayout
                     android:id = "@+id/personal_login_qq"
diff --git a/app/src/main/res/layout/kaifu_item_time.xml b/app/src/main/res/layout/kaifu_item_time.xml
index ae8367145b..0072ba7e5e 100644
--- a/app/src/main/res/layout/kaifu_item_time.xml
+++ b/app/src/main/res/layout/kaifu_item_time.xml
@@ -18,7 +18,7 @@
         android:id="@+id/kaifu_item_time_tv"
         android:layout_width = "wrap_content"
         android:layout_height = "wrap_content"
-        android:textColor = "@color/btn_plugin"
+        android:textColor = "@color/black"
         android:textSize = "13sp"
         android:layout_marginBottom="0.5dp" />
 
diff --git a/app/src/main/res/layout/libao_item_search.xml b/app/src/main/res/layout/layout_search_bar.xml
similarity index 65%
rename from app/src/main/res/layout/libao_item_search.xml
rename to app/src/main/res/layout/layout_search_bar.xml
index 442030fca6..038a06f587 100644
--- a/app/src/main/res/layout/libao_item_search.xml
+++ b/app/src/main/res/layout/layout_search_bar.xml
@@ -1,44 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android = "http://schemas.android.com/apk/res/android"
+    xmlns:app = "http://schemas.android.com/apk/res-auto"
     android:layout_width = "wrap_content"
-    android:layout_height = "38dp"
-    android:layout_marginBottom = "10dp"
-    android:layout_marginLeft = "35dp"
-    android:layout_marginRight = "35dp"
-    android:layout_marginTop = "19dp"
-    android:gravity = "center_vertical" >
+    android:layout_height = "35dp"
+    android:layout_marginBottom = "15dp"
+    android:layout_marginLeft = "20dp"
+    android:layout_marginRight = "20dp"
+    android:layout_marginTop = "15dp"
+    android:gravity = "center_vertical"
+    app:layout_scrollFlags = "scroll|enterAlwaysCollapsed" >
 
     <EditText
-        android:id = "@+id/libao_et_search"
+        android:id = "@+id/et_search"
         android:layout_width = "match_parent"
         android:layout_height = "match_parent"
         android:background = "@drawable/libao_search_bg"
         android:hint = "@string/libao_search_input"
         android:imeOptions = "actionSearch"
-        android:paddingLeft = "5dp"
+        android:paddingLeft = "15dp"
         android:paddingRight = "53dp"
         android:singleLine = "true"
         android:textColorHint = "@color/hint"
         android:textCursorDrawable = "@drawable/cursor_color"
-        android:textSize = "16sp" />
+        android:textSize = "14sp" />
 
     <TextView
-        android:id = "@+id/libao_tv_back"
+        android:id = "@+id/tv_back"
         android:layout_width = "wrap_content"
         android:layout_height = "match_parent"
         android:layout_marginBottom = "1dp"
         android:layout_marginTop = "1dp"
-        android:layout_toLeftOf = "@+id/libao_tv_search"
+        android:layout_toLeftOf = "@+id/tv_search"
         android:background = "@color/dcdcdc"
         android:gravity = "center"
         android:paddingLeft = "10dp"
         android:paddingRight = "10dp"
         android:text = "@string/libao_back"
-        android:textColor = "@android:color/white" />
+        android:textColor = "@android:color/white"
+        android:visibility = "gone" />
 
     <TextView
-        android:id = "@+id/libao_tv_search"
-        android:layout_width = "48dp"
+        android:id = "@+id/tv_search"
+        android:layout_width = "60dp"
         android:layout_height = "match_parent"
         android:layout_alignParentRight = "true"
         android:background = "@drawable/news_search_btn"
diff --git a/app/src/main/res/layout/message_item_answer.xml b/app/src/main/res/layout/message_item_answer.xml
deleted file mode 100644
index ebae1290be..0000000000
--- a/app/src/main/res/layout/message_item_answer.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android = "http://schemas.android.com/apk/res/android"
-    xmlns:app = "http://schemas.android.com/apk/res-auto"
-    android:id = "@+id/message_item"
-    android:layout_width = "match_parent"
-    android:layout_height = "wrap_content"
-    android:background = "@drawable/reuse_listview_item_style"
-    android:paddingBottom = "15dp"
-    android:paddingLeft = "20dp"
-    android:paddingRight = "20dp"
-    android:paddingTop = "20dp" >
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id = "@+id/message_item_user_icon"
-        style = "@style/frescoCircleStyle"
-        android:layout_width = "45dp"
-        android:layout_height = "45dp" />
-
-    <RelativeLayout
-        android:id = "@+id/message_item_user_rl"
-        android:layout_width = "0dp"
-        android:layout_height = "wrap_content"
-        android:layout_marginLeft = "15dp"
-        app:layout_constraintLeft_toRightOf = "@id/message_item_user_icon"
-        app:layout_constraintRight_toRightOf = "parent" >
-
-        <TextView
-            android:id = "@+id/message_item_user_name"
-            android:layout_width = "wrap_content"
-            android:layout_height = "wrap_content"
-            android:textColor = "@color/black"
-            android:textSize = "15sp" />
-
-        <TextView
-            android:id = "@+id/message_item_user_status"
-            android:layout_width = "wrap_content"
-            android:layout_height = "wrap_content"
-            android:layout_below = "@id/message_item_user_name"
-            android:layout_marginTop = "10dp"
-            android:textColor = "@color/title"
-            android:textSize = "12sp" />
-
-        <ImageView
-            android:id = "@+id/message_item_vote"
-            android:layout_width = "17dp"
-            android:layout_height = "17dp"
-            android:layout_below = "@id/message_item_user_name"
-            android:layout_marginTop = "8dp"
-            android:src = "@drawable/message_vote_icon"
-            android:visibility = "gone" />
-    </RelativeLayout >
-
-    <TextView
-        android:id = "@+id/message_item_title"
-        android:layout_width = "0dp"
-        android:layout_height = "wrap_content"
-        android:layout_marginLeft = "15dp"
-        android:layout_marginTop = "12dp"
-        android:background = "@color/libao_history_bg"
-        android:maxLines = "1"
-        android:paddingBottom = "10dp"
-        android:paddingLeft = "11dp"
-        android:paddingRight = "5dp"
-        android:paddingTop = "8dp"
-        android:textColor = "@color/title"
-        android:textSize = "11dp"
-        app:layout_constraintLeft_toRightOf = "@id/message_item_user_icon"
-        app:layout_constraintRight_toRightOf = "parent"
-        app:layout_constraintTop_toBottomOf = "@id/message_item_user_rl" />
-
-    <View
-        android:layout_width = "0dp"
-        android:layout_height = "1dp"
-        android:layout_marginLeft = "15dp"
-        android:background = "@color/text_f5f5f5"
-        app:layout_constraintLeft_toRightOf = "@id/message_item_user_icon"
-        app:layout_constraintRight_toRightOf = "parent"
-        app:layout_constraintTop_toBottomOf = "@id/message_item_title" />
-
-    <TextView
-        android:id = "@+id/message_item_content"
-        android:layout_width = "0dp"
-        android:layout_height = "wrap_content"
-        android:layout_marginLeft = "15dp"
-        android:layout_marginTop = "1dp"
-        android:background = "@color/libao_history_bg"
-        android:paddingBottom = "10dp"
-        android:paddingLeft = "11dp"
-        android:paddingRight = "5dp"
-        android:paddingTop = "8dp"
-        android:textColor = "@color/title"
-        android:textSize = "11dp"
-        app:layout_constraintLeft_toRightOf = "@id/message_item_user_icon"
-        app:layout_constraintRight_toRightOf = "parent"
-        app:layout_constraintTop_toBottomOf = "@id/message_item_title" />
-
-    <TextView
-        android:id = "@+id/message_item_time"
-        android:layout_width = "0dp"
-        android:layout_height = "wrap_content"
-        android:layout_marginLeft = "15dp"
-        android:layout_marginTop = "10dp"
-        android:textColor = "@color/hint"
-        android:textSize = "12dp"
-        app:layout_constraintLeft_toRightOf = "@id/message_item_user_icon"
-        app:layout_constraintRight_toRightOf = "parent"
-        app:layout_constraintTop_toBottomOf = "@id/message_item_content" />
-
-</android.support.constraint.ConstraintLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/questions_edit_index_item.xml b/app/src/main/res/layout/questions_edit_index_item.xml
index 19478083e8..48c1d2a36b 100644
--- a/app/src/main/res/layout/questions_edit_index_item.xml
+++ b/app/src/main/res/layout/questions_edit_index_item.xml
@@ -3,10 +3,10 @@
     xmlns:app = "http://schemas.android.com/apk/res-auto"
     android:layout_width = "match_parent"
     android:layout_height = "wrap_content"
-    android:paddingBottom = "12dp"
+    android:paddingBottom = "10dp"
     android:paddingLeft = "15dp"
     android:paddingRight = "15dp"
-    android:paddingTop = "20dp"
+    android:paddingTop = "17dp"
     android:background="@android:color/white">
 
     <TextView
@@ -22,7 +22,7 @@
         android:id = "@+id/questions_edit_index_answer_count"
         android:layout_width = "match_parent"
         android:layout_height = "wrap_content"
-        android:layout_marginTop = "12dp"
+        android:layout_marginTop = "9dp"
         android:textColor = "@color/button_gray"
         android:textSize = "11dp"
         app:layout_constraintTop_toBottomOf = "@id/questions_edit_index_title" />
diff --git a/app/src/main/res/layout/questions_edit_tag.xml b/app/src/main/res/layout/questions_edit_tag.xml
index c5eabb71a6..119adfb4cc 100644
--- a/app/src/main/res/layout/questions_edit_tag.xml
+++ b/app/src/main/res/layout/questions_edit_tag.xml
@@ -7,10 +7,11 @@
     <TextView
         android:id = "@+id/questions_edit_tag_title"
         android:layout_width = "match_parent"
-        android:layout_height = "wrap_content"
+        android:layout_height = "50dp"
         android:background = "@android:color/white"
-        android:padding = "20dp"
-        android:text = "标签能让你有更多回答哦"
+        android:gravity = "center_vertical"
+        android:paddingLeft = "20dp"
+        android:text = "选择标签"
         android:textColor = "@android:color/black"
         android:textSize = "14sp"
         android:textStyle = "bold" />
@@ -62,13 +63,19 @@
         </com.google.android.flexbox.FlexboxLayout >
     </com.gh.common.view.LimitHeightScrollView >
 
+    <View
+        android:id = "@+id/questions_edit_tag_line2"
+        android:layout_width = "match_parent"
+        android:layout_height = "1dp"
+        android:background = "@color/background"
+        app:layout_constraintTop_toBottomOf = "@id/questions_edit_tag_sv" />
 
     <android.support.constraint.ConstraintLayout
         android:layout_width = "match_parent"
         android:layout_height = "50dp"
         android:background = "@android:color/white"
         android:padding = "5dp"
-        app:layout_constraintTop_toBottomOf = "@id/questions_edit_tag_sv" >
+        app:layout_constraintTop_toBottomOf = "@id/questions_edit_tag_line2" >
 
         <TextView
             android:id = "@+id/questions_edit_tag_cancel"
diff --git a/app/src/main/res/layout/questionsdetail_item.xml b/app/src/main/res/layout/questionsdetail_item.xml
index 3458d7d880..175cf36dd8 100644
--- a/app/src/main/res/layout/questionsdetail_item.xml
+++ b/app/src/main/res/layout/questionsdetail_item.xml
@@ -95,13 +95,42 @@
             android:layout_weight = "1" />
     </LinearLayout >
 
+    <RelativeLayout
+        android:id = "@+id/questionsdetail_concern_rl"
+        android:layout_width = "match_parent"
+        android:layout_height = "wrap_content"
+        android:layout_marginLeft = "20dp"
+        android:layout_marginRight = "20dp"
+        android:layout_marginTop = "10dp"
+        app:layout_constraintTop_toBottomOf = "@id/questionsdetail_item_picll" >
+
+        <TextView
+            android:id = "@+id/questionsdetail_concern_count"
+            android:layout_width = "wrap_content"
+            android:layout_height = "wrap_content"
+            android:layout_centerVertical = "true"
+            android:textColor = "@color/title"
+            android:textSize = "12sp" />
+
+        <TextView
+            android:id = "@+id/questionsdetail_concern"
+            android:layout_width = "70dp"
+            android:layout_height = "25dp"
+            android:layout_alignParentRight = "true"
+            android:background = "@drawable/button_normal_style"
+            android:gravity = "center"
+            android:text = "关注问题"
+            android:textColor = "@android:color/white"
+            android:textSize = "12sp" />
+    </RelativeLayout >
+
     <View
         android:id = "@+id/questionsdetail_line_top"
         android:layout_width = "match_parent"
         android:layout_height = "1dp"
         android:layout_marginTop = "10dp"
         android:background = "@color/cutting_line"
-        app:layout_constraintTop_toBottomOf = "@id/questionsdetail_item_picll" />
+        app:layout_constraintTop_toBottomOf = "@id/questionsdetail_concern_rl" />
 
     <RelativeLayout
         android:id = "@+id/questionsdetail_answer"
diff --git a/app/src/main/res/layout/questionsinvite_item.xml b/app/src/main/res/layout/questionsinvite_item.xml
index 52783d298d..7854563f20 100644
--- a/app/src/main/res/layout/questionsinvite_item.xml
+++ b/app/src/main/res/layout/questionsinvite_item.xml
@@ -11,20 +11,22 @@
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id = "@+id/questionsinvite_item_icon"
-        style="@style/frescoCircleStyle"
+        style = "@style/frescoCircleStyle"
         android:layout_width = "45dp"
         android:layout_height = "45dp"
         android:layout_marginRight = "16dp" />
 
     <TextView
         android:id = "@+id/questionsinvite_item_name"
-        android:layout_width = "wrap_content"
+        android:layout_width = "0dp"
         android:layout_height = "wrap_content"
         android:layout_marginLeft = "16dp"
+        android:singleLine = "true"
         android:textColor = "@color/title"
         android:textSize = "14sp"
         app:layout_constraintBottom_toTopOf = "@+id/questionsinvite_item_rl"
         app:layout_constraintLeft_toRightOf = "@id/questionsinvite_item_icon"
+        app:layout_constraintRight_toLeftOf = "@+id/questionsinvite_item_invite"
         app:layout_constraintTop_toTopOf = "parent"
         app:layout_constraintVertical_chainStyle = "packed" />
 
diff --git a/app/src/main/res/menu/menu_question_invite.xml b/app/src/main/res/menu/menu_question_invite.xml
index 6fdaaba320..d11d2e9b7b 100644
--- a/app/src/main/res/menu/menu_question_invite.xml
+++ b/app/src/main/res/menu/menu_question_invite.xml
@@ -5,7 +5,7 @@
     <item
         android:id = "@+id/menu_answer_post"
         android:title = "好友"
-        app:actionLayout = "@layout/layout_menu_answer_post"
+        app:actionLayout = "@layout/layout_menu_question_invite"
         app:showAsAction = "always" />
 
 </menu >
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_question_post.xml b/app/src/main/res/menu/menu_question_post.xml
index f2529e9f85..76c1b03014 100644
--- a/app/src/main/res/menu/menu_question_post.xml
+++ b/app/src/main/res/menu/menu_question_post.xml
@@ -4,8 +4,8 @@
 
     <item
         android:id = "@+id/menu_question_post"
-        android:title = "发布"
-        app:actionLayout = "@layout/layout_menu_answer_post"
+        android:title = "提交"
+        app:actionLayout = "@layout/layout_menu_question_post"
         app:showAsAction = "always" />
 
 </menu >
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_questions_detail.xml b/app/src/main/res/menu/menu_questions_detail.xml
index 8b3848dbd5..4a61c606f0 100644
--- a/app/src/main/res/menu/menu_questions_detail.xml
+++ b/app/src/main/res/menu/menu_questions_detail.xml
@@ -2,11 +2,11 @@
 <menu xmlns:android = "http://schemas.android.com/apk/res/android"
     xmlns:app = "http://schemas.android.com/apk/res-auto" >
 
-    <item
-        android:id = "@+id/menu_question_concern"
-        android:icon = "@drawable/menu_ic_question_concern_unselect"
-        android:title = "@string/concern"
-        app:showAsAction = "always" />
+    <!--<item-->
+        <!--android:id = "@+id/menu_question_concern"-->
+        <!--android:icon = "@drawable/menu_ic_question_concern_unselect"-->
+        <!--android:title = "@string/concern"-->
+        <!--app:showAsAction = "always" />-->
 
     <item
         android:id = "@+id/menu_more"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3825d7aa8..ec49a427c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -545,5 +545,7 @@
     <string name = "ask_tags_reseting" >恢复中...</string >
     <string name = "check_comment" >查看评论</string >
     <string name = "comment" >我来评论</string >
+    <string name = "sign_dialog_content" >已连续签到<Data ><![CDATA[<font color="#1a7bd5">%1$d</font>天]]></Data ></string >
+    <string name = "sign_dialog_content2" ><Data ><![CDATA[累计经验： <font color="#1a7bd5">%1$d</font>]]></Data ></string >
 
 </resources >