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 6b334e4824..85a29464f0 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -432,13 +432,13 @@ public class DialogUtils {
         Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE);
         Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE);
 
-        positiveBtn.setTextSize(13);
+        positiveBtn.setTextSize(14);
         positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
-        negativeBtn.setTextSize(13);
+        negativeBtn.setTextSize(14);
         negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
         if (mesage != null) {
-            mesage.setTextSize(13);
-            mesage.setTextColor(ContextCompat.getColor(context, R.color.title));
+            mesage.setTextSize(14);
+            mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar));
             mesage.setLineSpacing(1.0f, 1.3f);
         }
 
@@ -477,13 +477,13 @@ public class DialogUtils {
         Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE);
         Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE);
 
-        positiveBtn.setTextSize(13);
+        positiveBtn.setTextSize(14);
         positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
-        negativeBtn.setTextSize(13);
+        negativeBtn.setTextSize(14);
         negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint));
         if (mesage != null) {
-            mesage.setTextSize(13);
-            mesage.setTextColor(ContextCompat.getColor(context, R.color.title));
+            mesage.setTextSize(14);
+            mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar));
             mesage.setLineSpacing(1.0f, 1.3f);
         }
 
@@ -528,13 +528,13 @@ public class DialogUtils {
         Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE);
         Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE);
 
-        positiveBtn.setTextSize(13);
+        positiveBtn.setTextSize(14);
         positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
-        negativeBtn.setTextSize(13);
+        negativeBtn.setTextSize(14);
         negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint));
         if (mesage != null) {
-            mesage.setTextSize(13);
-            mesage.setTextColor(ContextCompat.getColor(context, R.color.title));
+            mesage.setTextSize(14);
+            mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar));
             mesage.setLineSpacing(1.0f, 1.3f);
         }
 
diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
index f8b27b55fd..ded84f9938 100644
--- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
@@ -4,12 +4,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.gh.base.BaseActivity;
 import com.gh.base.OnRequestCallBackListener;
@@ -37,6 +39,10 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On
     RelativeLayout mConcernTitleRl;
     @BindView(R.id.reuse_none_data)
     LinearLayout mNoneData;
+    @BindView(R.id.reuse_tv_none_data)
+    TextView mNoDataTv;
+    @BindView(R.id.reuse_no_connection)
+    LinearLayout mNoConn;
 
     private ConcernAdapter concernAdapter;
     private ConcernRecommendAdapter concernRecommendAdapter;
@@ -74,7 +80,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On
     }
 
     @Override
-    public void loadDone() {
+    public void loadDone() { // 关注推荐 回调
         mConcernTitleRl.setVisibility(View.VISIBLE);
         mConcernRecommendRv.setVisibility(View.VISIBLE);
         int size = concernRecommendAdapter.getRecommendGameList().size();
@@ -85,13 +91,24 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On
     // 关注的游戏加载完成 再加载热门推荐(根据已关注的游戏过滤)
     @Override
     public void loadDone(Object obj) {
+        mNoConn.setVisibility(View.GONE);
+        mNoneData.setVisibility(View.GONE);
+
         concernRecommendAdapter = new ConcernRecommendAdapter(this, this, (List<GameEntity>)obj, mEntrance);
         mConcernRecommendRv.setAdapter(concernRecommendAdapter);
+
+        if (obj == null) { // 未登录状态
+            mNoneData.setVisibility(View.VISIBLE);
+            mConcernRv.setVisibility(View.GONE);
+            mNoDataTv.setText(R.string.login_hint);
+            mNoDataTv.setTextColor(ContextCompat.getColor(ConcernActivity.this, R.color.theme));
+        }
     }
 
     @Override
     public void loadError() {
-
+        mNoConn.setVisibility(View.VISIBLE);
+        mNoneData.setVisibility(View.GONE);
     }
 
     @Override
@@ -100,6 +117,8 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On
                 || concernAdapter.getConcernGameList().isEmpty()) {
             mNoneData.setVisibility(View.VISIBLE);
             mConcernRv.setVisibility(View.GONE);
+            mNoDataTv.setText(R.string.game_empty);
+            mNoDataTv.setTextColor(ContextCompat.getColor(ConcernActivity.this, R.color.c7c7c7));
         }
         if (concernRecommendAdapter.getRecommendGameList() == null
                 || concernRecommendAdapter.getRecommendGameList().isEmpty()) {
diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java
index 2524ee465a..1c2b15c094 100644
--- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java
@@ -306,7 +306,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
         View inflate = View.inflate(this, R.layout.dialog_font_size, null);
         final RadioGroup radioGroup = (RadioGroup) inflate.findViewById(R.id.font_size_radiogroup);
         ((RadioButton) (radioGroup.getChildAt(checkSizeIndex - 1))).setChecked(true);
-        AlertDialog alertDialog = new AlertDialog.Builder(this, R.style.FontSizeAlertDialog)
+        AlertDialog alertDialog = new AlertDialog.Builder(this, R.style.GhAlertDialog)
                 .setTitle(getString(R.string.font_primary))
                 .setPositiveButton("取消", new DialogInterface.OnClickListener() {
                     @Override
@@ -335,13 +335,13 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
         Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE);
         Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE);
 
-        positiveBtn.setTextSize(13);
+        positiveBtn.setTextSize(14);
         positiveBtn.setTextColor(ContextCompat.getColor(this, R.color.theme));
-        negativeBtn.setTextSize(13);
+        negativeBtn.setTextSize(14);
         negativeBtn.setTextColor(ContextCompat.getColor(this, R.color.theme));
         if (mesage != null) {
-            mesage.setTextSize(13);
-            mesage.setTextColor(ContextCompat.getColor(this, R.color.title));
+            mesage.setTextSize(14);
+            mesage.setTextColor(ContextCompat.getColor(this, R.color.system_bar));
         }
 
 
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java
index abb710613d..9d8ad64bc6 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java
@@ -1,5 +1,6 @@
 package com.gh.gamecenter.adapter;
 
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
@@ -10,6 +11,7 @@ import com.gh.common.util.ConcernUtils;
 import com.gh.common.util.DataCollectionUtils;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
+import com.gh.common.util.LoginUtils;
 import com.gh.common.util.StringUtils;
 import com.gh.gamecenter.ConcernActivity;
 import com.gh.gamecenter.GameDetailActivity;
@@ -43,16 +45,17 @@ public class ConcernAdapter extends BaseRecyclerAdapter<ConcernViewHolder> {
     public ConcernAdapter(ConcernActivity context, OnRequestCallBackListener listener, String entrance) {
         super(context);
         mListener = listener;
-
         mEntrance = entrance;
-
         mConcernGameList = new ArrayList<>();
+
         initConcernGame();
     }
 
-    private void initConcernGame() {
-
-       // TODO 按时间排序
+    public void initConcernGame() {
+        if (TextUtils.isEmpty(LoginUtils.getToken(mContext))) {
+            mListener.loadDone(null);
+            return;
+        }
         RetrofitManager.getInstance(mContext).getApi()
                 .getConcern()
                 .subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java
index 441ff5d329..e9f7df9cc5 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java
@@ -103,14 +103,16 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter<ConcernViewHold
                             }
                         }
 
-                        for (int i = 0; i < mRecommendGameList.size(); i++) { // 过滤已关注的游戏
-                            String recommendId = mRecommendGameList.get(i).getId();
-                            for (int j = 0; j < mConcernGameList.size(); j++) {
-                                String concernId = mConcernGameList.get(j).getId();
-                                if (recommendId.equals(concernId)) {
-                                    mRecommendGameList.remove(i);
-                                    i--;
-                                    break;
+                        if (mConcernGameList != null) { // 过滤已关注的游戏
+                            for (int i = 0; i < mRecommendGameList.size(); i++) {
+                                String recommendId = mRecommendGameList.get(i).getId();
+                                for (int j = 0; j < mConcernGameList.size(); j++) {
+                                    String concernId = mConcernGameList.get(j).getId();
+                                    if (recommendId.equals(concernId)) {
+                                        mRecommendGameList.remove(i);
+                                        i--;
+                                        break;
+                                    }
                                 }
                             }
                         }
diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java
index a770879795..0acbdcb45c 100644
--- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java
@@ -89,9 +89,6 @@ public class ArticleAdapter extends BaseRecyclerAdapter {
                         if (response.size() != 0) {
                             mNewsList.addAll(response);
                                 notifyItemRangeInserted(mNewsList.size() - response.size(), response.size());
-                        } else {
-                            isOver = true;
-                            notifyItemChanged(getItemCount() - 1);
                         }
 
                         if (offset == 0 && mListener != null) {
@@ -104,6 +101,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter {
 
                         if (response.size() < 20) {
                             isOver = true;
+                            notifyItemChanged(getItemCount() - 1);
                         }
 
                         // 获取新闻阅读量
@@ -259,7 +257,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter {
         if (newsEntity.getThumbnail() != null &&  newsEntity.getThumbnail().getUrl() != null) {
             ImageUtils.Companion.display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0));
         } else {
-            ImageUtils.Companion.display(viewHolder.thumb, null); // 没有图片直接设置为null 防止列表串行
+            ImageUtils.Companion.display(viewHolder.thumb, "res:///" + R.drawable.collection_default_icon);
         }
         viewHolder.title.setText(newsEntity.getTitle());
         int views = newsEntity.getViews();
diff --git a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java
index 5c633d28f3..5c42baec0b 100644
--- a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java
@@ -71,9 +71,6 @@ public class ToolsAdapter extends BaseRecyclerAdapter {
                         if (response.size() != 0) {
                             mEntityList.addAll(response);
                             notifyItemRangeInserted(mEntityList.size() - response.size(), response.size());
-                        } else {
-                            isOver = true;
-                            notifyItemChanged(getItemCount() - 1);
                         }
 
                         if (offset == 0 && mListener != null) {
@@ -86,6 +83,7 @@ public class ToolsAdapter extends BaseRecyclerAdapter {
 
                         if (response.size() < 20) {
                             isOver = true;
+                            notifyItemChanged(getItemCount() - 1);
                         }
 
                     }
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java
index e30690da0b..f7cb7a21c2 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java
@@ -3,11 +3,13 @@ package com.gh.gamecenter.libao;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
 import com.gh.base.fragment.BaseFragment;
@@ -45,6 +47,8 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O
     LinearLayout mNoConnectionLayout;
     @BindView(R.id.reuse_none_data)
     LinearLayout mEmptyLayout;
+    @BindView(R.id.reuse_tv_none_data)
+    TextView mNoDataTv;
 
     private LinearLayoutManager mLayoutManager;
     private Libao2FragmentAdapter adapter;
@@ -127,6 +131,16 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O
         mEmptyLayout.setVisibility(View.VISIBLE);
     }
 
+    @Override
+    public void loadDone(Object obj) {
+        super.loadDone(obj);
+        mRefreshLayout.setRefreshing(false);
+        mLoadingLayout.setVisibility(View.GONE);
+        mEmptyLayout.setVisibility(View.VISIBLE);
+        mNoDataTv.setText(R.string.login_hint);
+        mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme));
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == LIBAO_CONCERN_REQUEST && adapter.getSkipPosition() != -1) {
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java
index 9cfbfe38e4..6d97571a01 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java
@@ -14,6 +14,7 @@ import com.gh.common.constant.ItemViewType;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LibaoUtils;
+import com.gh.common.util.LoginUtils;
 import com.gh.common.util.PlatformUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
@@ -74,6 +75,11 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
 
     // 加载数据
     public void addList(final int offset) {
+        if (TextUtils.isEmpty(LoginUtils.getToken(mContext))) {
+            mCallBackListener.loadDone(null);
+            return;
+        }
+
         if (isLoading) {
             return;
         }
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java
index 2de377e67c..64b1c152ac 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java
@@ -2,11 +2,13 @@ package com.gh.gamecenter.libao;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
 import com.gh.base.fragment.BaseFragment;
@@ -37,6 +39,8 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O
     LinearLayout mEmptyLayout;
     @BindView(R.id.reuse_no_connection)
     LinearLayout mNoConn;
+    @BindView(R.id.reuse_tv_none_data)
+    TextView mNoDataTv;
 
     private LinearLayoutManager mLayoutManager;
     private Libao3FragmentAdapter adapter;
@@ -107,6 +111,16 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O
         mNoConn.setVisibility(View.VISIBLE);
     }
 
+    @Override
+    public void loadDone(Object obj) {
+        super.loadDone(obj);
+        mRefreshLayout.setRefreshing(false);
+        mLoadingLayout.setVisibility(View.GONE);
+        mEmptyLayout.setVisibility(View.VISIBLE);
+        mNoDataTv.setText(R.string.login_hint);
+        mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme));
+    }
+
     @OnClick(R.id.reuse_no_connection)
     public void reconnection() { // 重新连接
         mRefreshLayout.setRefreshing(true);
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
index 208e9d212e..2149d8fc07 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
@@ -12,6 +12,7 @@ import com.gh.base.OnRequestCallBackListener;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LibaoUtils;
+import com.gh.common.util.LoginUtils;
 import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.StringUtils;
 import com.gh.gamecenter.LibaoDetailActivity;
@@ -56,24 +57,12 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter<RecyclerView.ViewHolder>
         mLibaoList = new ArrayList<>();
     }
 
-    private void initData() {
-        for (int i = 0; i < mLibaoList.size(); i++) {
-            LibaoEntity libaoEntity = mLibaoList.get(i);
-            if (!libaoEntity.isActive()) {
-                mLibaoList.remove(i);
-                i--;
-            }
-        }
-
-        if (mLibaoList.size() == 0) {
-            mCallBackListener.loadEmpty();
-        } else {
-            mCallBackListener.loadDone();
-        }
-        notifyDataSetChanged();
-    }
-
     void loadData(int offset) {
+        if (TextUtils.isEmpty(LoginUtils.getToken(mContext))) {
+            mCallBackListener.loadDone(null);
+            return;
+        }
+
         if (offset == 0) {
             mLibaoList.clear();
         }
@@ -125,6 +114,23 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter<RecyclerView.ViewHolder>
                 });
     }
 
+    private void initData() {
+        for (int i = 0; i < mLibaoList.size(); i++) {
+            LibaoEntity libaoEntity = mLibaoList.get(i);
+            if (!libaoEntity.isActive()) {
+                mLibaoList.remove(i);
+                i--;
+            }
+        }
+
+        if (mLibaoList.size() == 0) {
+            mCallBackListener.loadEmpty();
+        } else {
+            mCallBackListener.loadDone();
+        }
+        notifyDataSetChanged();
+    }
+
     //获取礼包状态
     private void getLibaoStatus(List<LibaoEntity> response) {
         StringBuilder builder = new StringBuilder();
diff --git a/app/src/main/res/drawable-xxhdpi/collection_default_icon.png b/app/src/main/res/drawable-xxhdpi/collection_default_icon.png
new file mode 100644
index 0000000000..d98f126a08
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/collection_default_icon.png differ
diff --git a/app/src/main/res/layout/activity_concern.xml b/app/src/main/res/layout/activity_concern.xml
index 951f5b8c69..ae2956c293 100644
--- a/app/src/main/res/layout/activity_concern.xml
+++ b/app/src/main/res/layout/activity_concern.xml
@@ -17,6 +17,7 @@
             android:layout_height = "match_parent" />
 
         <include layout = "@layout/reuse_none_data" />
+        <include layout="@layout/reuse_no_connection"/>
     </RelativeLayout >
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/activity_libao.xml b/app/src/main/res/layout/activity_libao.xml
index ecf17def08..de4a8029bc 100644
--- a/app/src/main/res/layout/activity_libao.xml
+++ b/app/src/main/res/layout/activity_libao.xml
@@ -64,21 +64,11 @@
 
     </LinearLayout >
 
-    <RelativeLayout
+    <com.lightgame.view.NoScrollableViewPager
+        android:id = "@+id/libao_vp_content"
         android:layout_width = "match_parent"
-        android:layout_height = "match_parent" >
+        android:layout_height = "match_parent"
+        android:overScrollMode = "never" />
 
-        <com.lightgame.view.NoScrollableViewPager
-            android:id = "@+id/libao_vp_content"
-            android:layout_width = "match_parent"
-            android:layout_height = "match_parent"
-            android:overScrollMode = "never" />
-
-        <View
-            android:layout_width = "match_parent"
-            android:layout_height = "7dp"
-            android:background = "@drawable/shadow_down" />
-
-    </RelativeLayout >
 
 </LinearLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_collection.xml b/app/src/main/res/layout/fragment_collection.xml
index 5f12f795bb..675cc26a40 100644
--- a/app/src/main/res/layout/fragment_collection.xml
+++ b/app/src/main/res/layout/fragment_collection.xml
@@ -53,10 +53,4 @@
         android:layout_below = "@+id/collection_tabbar"
         android:overScrollMode = "never" />
 
-    <View
-        android:layout_width = "match_parent"
-        android:layout_height = "7dp"
-        android:layout_below = "@+id/collection_tabbar"
-        android:background = "@drawable/shadow_down" />
-
 </RelativeLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_libao.xml b/app/src/main/res/layout/fragment_libao.xml
index d51a5f4f26..5f465a7844 100644
--- a/app/src/main/res/layout/fragment_libao.xml
+++ b/app/src/main/res/layout/fragment_libao.xml
@@ -71,10 +71,4 @@
         android:layout_below = "@id/vp_tab"
         android:overScrollMode = "never" />
 
-    <View
-        android:layout_width = "match_parent"
-        android:layout_height = "7dp"
-        android:layout_below = "@id/vp_tab"
-        android:background = "@drawable/shadow_down" />
-
 </RelativeLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_news.xml b/app/src/main/res/layout/fragment_news.xml
index 6fa046fd98..dc5e674fb7 100644
--- a/app/src/main/res/layout/fragment_news.xml
+++ b/app/src/main/res/layout/fragment_news.xml
@@ -91,10 +91,4 @@
         android:layout_below = "@+id/news_tabbar"
         android:overScrollMode = "never" />
 
-    <View
-        android:layout_width = "match_parent"
-        android:layout_height = "7dp"
-        android:layout_below = "@+id/news_tabbar"
-        android:background = "@drawable/shadow_down" />
-
 </RelativeLayout >
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d8fca0c65..b288c59e78 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
     <string name = "share_send_to_install" >右划发给好友\n免流量安装</string >
     <string name = "share_release_to_install" >放手发给好友\n免流量安装</string >
     <string name = "tap_to_reload" >加载失败，点击重试</string >
-    <string name = "fuli_description" >客服信息</string >
+    <string name = "fuli_description" >福利信息</string >
     <string name = "fuli_wanna_consult" >我要咨询</string >
     <string name = "fuli_wanna_join" >我要加入</string >
     <string name = "game_everybody_playing" >大家都在玩</string >
@@ -287,5 +287,6 @@
     <string name = "article_gonglve_hint" >精品</string >
     <string name = "personal_default_username" >手机登录</string >
     <string name = "home_entrance_default_text" >插件</string >
+    <string name = "login_hint" >请先登录</string >
 
 </resources >
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 950eaae9cf..0d2ea4aa6c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -88,12 +88,8 @@
     </style >
 
     <style name = "GhAlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name = "android:textSize">15sp</item>
-        <item name = "android:textColor">@color/title</item>
-    </style>
-
-    <style name = "FontSizeAlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name = "android:textSize">15sp</item>
-        <item name = "android:textColor">@android:color/black</item>
+        <item name = "android:textSize">17sp</item>
+        <item name = "android:textStyle">bold</item>
+        <item name = "android:textColor">@color/system_bar</item>
     </style>
 </resources >
\ No newline at end of file