diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment.java b/app/src/main/java/com/gh/base/fragment/BaseFragment.java
index 2828884505..714826f064 100644
--- a/app/src/main/java/com/gh/base/fragment/BaseFragment.java
+++ b/app/src/main/java/com/gh/base/fragment/BaseFragment.java
@@ -14,7 +14,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.gh.base.BaseToolBarActivity;
 import com.gh.base.OnListClickListener;
 import com.gh.base.OnRequestCallBackListener;
 import com.gh.gamecenter.eventbus.EBMiPush;
@@ -86,15 +85,6 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         handleOnClick(v);
     }
 
-    protected void setNavigationTitle(@StringRes int res) {
-        setNavigationTitle(getString(res));
-    }
-
-    protected void setNavigationTitle(String title) {
-        if (getActivity() instanceof BaseToolBarActivity) {
-            ((BaseToolBarActivity) getActivity()).setNavigationTitle(title);
-        }
-    }
 
     protected void initView(View view) {
     }
diff --git a/app/src/main/java/com/gh/gamecenter/CommonActivity.java b/app/src/main/java/com/gh/gamecenter/CommonActivity.java
index 4b018ebd8f..581b4b269d 100644
--- a/app/src/main/java/com/gh/gamecenter/CommonActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/CommonActivity.java
@@ -23,11 +23,6 @@ public class CommonActivity extends BaseToolBarActivity implements ToolbarContro
 
     }
 
-    @Override
-    public void setNavigationTitle(CharSequence res) {
-
-    }
-
     @Override
     public void setToolbarMenu(int res) {
 
diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
index 65de9ff54a..9e0f823ccf 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
@@ -8,14 +8,13 @@ import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.entity.ConcernEntity;
 import com.gh.gamecenter.message.MessageDetailFragment;
 import com.halo.assistant.HaloApp;
-import com.halo.assistant.ui.IntentFactory;
 
 /**
  * Created by khy on 2016/11/8.
  * 消息详情界面(评论详情）
  */
 @Deprecated
-public class MessageDetailActivity extends CommonActivity {
+public class MessageDetailActivity extends NormalActivity {
 
     // 评论回复
     public static Intent getMessageDetailIntent(Context context, CommentEntity entity, String newsId) {
@@ -25,10 +24,7 @@ public class MessageDetailActivity extends CommonActivity {
         intent.putExtra("openSoftInput", true);
         intent.putExtra(CommentEntity.TAG, entity);
 
-        return new IntentFactory.Builder(context)
-                .setArgs(intent.getExtras())
-                .setActivity(MessageDetailActivity.class)
-                .setFragment(MessageDetailFragment.class).build();
+        return getIntent(context, MessageDetailFragment.class, intent.getExtras());
     }
 
     public static Intent getIntentByEntity(Context context, ConcernEntity concernEntity, String entrance) {
@@ -37,10 +33,7 @@ public class MessageDetailActivity extends CommonActivity {
         HaloApp.put(ConcernEntity.TAG, concernEntity);
         intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
 //        return intent;
-        return new IntentFactory.Builder(context)
-                .setArgs(intent.getExtras())
-                .setActivity(MessageDetailActivity.class)
-                .setFragment(MessageDetailFragment.class).build();
+        return getIntent(context, MessageDetailFragment.class, intent.getExtras());
     }
 
     public static Intent getIntentById(Context context, String newsId, Integer commentNum, Boolean openSoftInput, String entrance) {
@@ -50,10 +43,7 @@ public class MessageDetailActivity extends CommonActivity {
         intent.putExtra("commentNum", commentNum);
         intent.putExtra("openSoftInput", openSoftInput);
 //        return intent;
-        return new IntentFactory.Builder(context)
-                .setArgs(intent.getExtras())
-                .setActivity(MessageDetailActivity.class)
-                .setFragment(MessageDetailFragment.class).build();
+        return getIntent(context, MessageDetailFragment.class, intent.getExtras());
     }
 
 }
diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java
index 74c8b94efa..4abdfe1ad6 100644
--- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java
@@ -137,8 +137,9 @@ public class NormalActivity extends BaseActivity implements ToolbarController, T
     }
 
     @Override
-    public void setNavigationTitle(CharSequence res) {
-        mNormalTitle.setText(res);
+    public void setNavigationTitle(String res) {
+        if (!TextUtils.isEmpty(res))
+            mNormalTitle.setText(res);
     }
 
     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java
index 4bf0f3ad68..601cd0dd28 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java
@@ -17,7 +17,6 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.base.fragment.BaseFragment;
 import com.gh.common.constant.Config;
 import com.gh.common.util.CheckLoginUtils;
 import com.gh.common.util.DialogUtils;
@@ -37,6 +36,7 @@ import com.gh.gamecenter.entity.ViewsEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.manager.CommentManager;
 import com.gh.gamecenter.manager.UserManager;
+import com.gh.gamecenter.normal.NormalFragment;
 import com.gh.gamecenter.retrofit.OkHttpCache;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -67,7 +67,7 @@ import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG;
  * Created by CsHeng on 18/12/2017.
  * 消息详情界面--评论详情--对话详情
  */
-public class MessageDetailFragment extends BaseFragment implements OnCommentCallBackListener, OnBackPressedListener {
+public class MessageDetailFragment extends NormalFragment implements OnCommentCallBackListener, OnBackPressedListener {
 
     public static final int REQUEST_UPDATE_COMMENT = 9; // 刷新文章web页面评论数
 
diff --git a/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java b/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java
index 807b8e51aa..556f02c692 100644
--- a/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/normal/NormalFragment.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.annotation.IdRes;
 import android.support.annotation.MenuRes;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -30,6 +31,12 @@ public abstract class NormalFragment extends BaseFragment {
         }
     }
 
+    protected void setNavigationTitle(@StringRes int title) {
+        if (getActivity() instanceof ToolbarController) {
+            ((ToolbarController) getActivity()).setNavigationTitle(title);
+        }
+    }
+
     protected void initMenu(@MenuRes int res) {
         if (getActivity() instanceof ToolbarController) {
             ((ToolbarController) getActivity()).setToolbarMenu(res);
diff --git a/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java b/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java
index f0ddcdc3fb..e7c4aa9c0f 100644
--- a/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java
+++ b/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java
@@ -13,7 +13,7 @@ public interface ToolbarController {
 
     void setNavigationTitle(@StringRes int res);
 
-    void setNavigationTitle(CharSequence res);
+    void setNavigationTitle(String res);
 
     void setToolbarMenu(@MenuRes int res);