Merge remote-tracking branch 'origin/temp' into dev

2017-12-15 11:00:08 +08:00
parent 765b4c3afa bf7b0b0a82
commit a022526e7e
128 changed files with 3328 additions and 2705 deletions
--- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
@ -188,7 +188,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall
            mConcernEntity = null;
        }

-        initTitle(getString(R.string.title_message_detail));
+        setNavigationTitle(getString(R.string.title_message_detail));

        adapter = new MessageDetailAdapter(this, this, mMessageDetailRv, mConcernEntity, mEntrance);
        mLayoutManager = new LinearLayoutManager(this);