diff --git a/app/build.gradle b/app/build.gradle
index 38f55d2e9..e7827cd86 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -147,7 +147,7 @@ android {
         }
 
         debug {
-//            buildConfigField "String", "BASE_URL", "\"https://115.28.86.139/\""
+//            buildConfigField "String", "BASE_URL", "\"http://120.79.211.243/\""
             buildConfigField "String", "BASE_URL", "\"http://apibeta.qxjiaoyou.com/\""
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "\"https://preview.qxjiaoyou.com/\""
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java
index d26bb1fd0..1270e2eab 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java
@@ -31,11 +31,11 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerTitleView getTitleView(Context context, final int i) {
         ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true, 8);
-        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_B3B3B3));
-        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_333333));
+        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_white));
+        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_white));
         scaleTransitionPagerTitleView.setMinScale(0.7f);
-        scaleTransitionPagerTitleView.setTextSize(21);
-        int padding = UIUtil.dip2px(context, 6);
+        scaleTransitionPagerTitleView.setTextSize(18);
+        int padding = UIUtil.dip2px(context, 5);
         scaleTransitionPagerTitleView.setPadding(padding,0,padding,0);
 //        scaleTransitionPagerTitleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 36);
         scaleTransitionPagerTitleView.setText(mTitleList.get(i));
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
index 6b843c3f4..3a1ab5ff7 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
@@ -62,6 +62,7 @@ import com.yizhuan.erban.base.list.BaseViewHolder;
 import com.yizhuan.erban.base.list.CommonAdapter;
 import com.yizhuan.erban.bindadapter.BaseAdapter;
 import com.yizhuan.erban.common.widget.dialog.DialogManager;
+import com.yizhuan.erban.community.square.SquareDynamicFragment;
 import com.yizhuan.erban.databinding.FragmentGameHomeBinding;
 import com.yizhuan.erban.home.adapter.BannerAdapter;
 import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
@@ -70,6 +71,7 @@ import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
 import com.yizhuan.erban.home.view.IMainFragmentView;
 import com.yizhuan.erban.location.LocationUploadEvent;
 import com.yizhuan.erban.radish.signin.SignInActivity;
+import com.yizhuan.erban.ui.indicator_impl.IndicatorHelper;
 import com.yizhuan.erban.ui.search.SearchActivity;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
@@ -167,6 +169,15 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
     private volatile boolean isUserLogin;
     private volatile boolean initHomeTitle;
 
+    /**
+     * 动态
+     */
+    public static final int TAB_TYPE_DYNAMIC = 0;
+    /**
+     * 聊天交友
+     */
+    public static final int TAB_TYPE_CHAT = 1;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -257,7 +268,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
     /**
      * 初始化tab
      */
-    private void initTitleTab(List<HomeTitleInfo> homeTitleInfos) {
+    private void initRoomTitleTab(List<HomeTitleInfo> homeTitleInfos) {
         if (ListUtils.isListEmpty(homeTitleInfos)) {
             return;
         }
@@ -324,6 +335,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
 
         commonNavigator.setAdapter(magicIndicatorAdapter);
         mBinding.magicIndicator.setNavigator(commonNavigator);
+
         commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
 
         mBinding.viewPager.setOffscreenPageLimit(5);
@@ -338,6 +350,40 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
 
     }
 
+    /**
+     * 初始化tab
+     */
+    private void initTitleTab() {
+        List<Integer> fragmentPos = new ArrayList<>();
+        fragmentPos.add(TAB_TYPE_DYNAMIC);
+        fragmentPos.add(TAB_TYPE_CHAT);
+        List<String> tagList = new ArrayList<>();
+        List<Fragment> fragmentList = new ArrayList<>();
+        for (Integer integer : fragmentPos) {
+            if (integer == TAB_TYPE_DYNAMIC) {
+                tagList.add(getResources().getString(R.string.home_tab_dynamic));
+            } else {
+                tagList.add(getResources().getString(R.string.home_tab_caht));
+            }
+            fragmentList.add(SquareDynamicFragment.newInstance(integer));
+        }
+
+        //init viewpager
+        mBinding.viewPagerBottom.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragmentList));
+
+        mBinding.viewPagerBottom.addOnPageChangeListener(new OnPageSelectedListener() {
+            @Override
+            public void onPageSelected(int position) {
+                StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SQUARE_RECOMMEND_FOLLOW,
+                        "切换推荐和关注tab-区分-" + ((position == 0) ? "动态" : "聊天交友"));
+            }
+        });
+
+        //init indicator
+        IndicatorHelper.handle(getContext(), mBinding.viewPagerBottom, mBinding.magicIndicatorBottom, tagList);
+
+    }
+
     private void exitRoom(BaseAdapter<GameInfo> adapter, int position) {
         if (DemoCache.readFirstMatchDialog()) {
             DemoCache.saveFirstMatchDialog();
@@ -604,6 +650,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
             }
         }
         mBinding.viewPager.setCurrentItem(position);
+        mBinding.viewPagerBottom.setCurrentItem(position);
         mLastPosition = position;
 
     }
@@ -744,7 +791,9 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
         initHomeBanner(homeBannerInfo.getFirstPageBannerVos());
         this.mHomeTitleInfos = homeBannerInfo.getAllVo();
         if (isUserLogin) {
-            initTitleTab(homeBannerInfo.getAllVo());
+            initRoomTitleTab(homeBannerInfo.getAllVo());
+            initTitleTab();
+
         }
 
         initQxTopBanner(homeBannerInfo.getTopBanners());
@@ -872,7 +921,9 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
     private void refreshData() {
         isUserLogin = true;
         if (!initHomeTitle && mHomeTitleInfos != null) {
-            initTitleTab(mHomeTitleInfos);
+            initRoomTitleTab(mHomeTitleInfos);
+            initTitleTab();
+
         }
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
         //登录的时候显示位置，更好的
diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml
index 7605c80be..f7e14cc0a 100644
--- a/app/src/main/res/layout/fragment_game_home.xml
+++ b/app/src/main/res/layout/fragment_game_home.xml
@@ -17,7 +17,8 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/color_F9F9F9">
 
         <ImageView
             android:layout_width="match_parent"
@@ -41,9 +42,10 @@
                 <android.support.design.widget.CollapsingToolbarLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:contentScrim="#FF6956F0"
+                    app:contentScrim="#6956F0"
                     app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
+
                     <android.support.constraint.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -58,32 +60,64 @@
                             android:scaleType="fitXY"
                             app:layout_constraintTop_toTopOf="parent" />
 
-                        <com.jude.rollviewpager.RollPagerView
-                            android:id="@+id/roll_view"
-                            android:layout_width="match_parent"
-                            android:layout_height="120dp"
-                            android:layout_marginStart="@dimen/dp_20"
-                            android:layout_marginEnd="@dimen/dp_20"
-                            android:layout_marginTop="@dimen/dp_12"
+
+                        <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
+                            android:id="@+id/magic_indicator"
+                            android:layout_width="wrap_content"
+                            android:layout_height="48dp"
+                            android:paddingLeft="14dp"
+                            android:paddingRight="14dp"
                             app:layout_constraintTop_toBottomOf="@id/iv_bg"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:rollviewpager_hint_gravity="left"
-                            app:rollviewpager_hint_paddingBottom="8dp"
                             />
 
+                        <android.support.v4.view.ViewPager
+                            android:id="@+id/view_pager"
+                            android:layout_width="match_parent"
+                            android:layout_height="300dp"
+                            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                            app:layout_constraintTop_toBottomOf="@id/magic_indicator"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            />
+
+                        <FrameLayout
+                            android:id="@+id/fl_roll_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/color_F9F9F9"
+                            app:layout_constraintTop_toBottomOf="@id/view_pager"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            >
+
+                            <com.jude.rollviewpager.RollPagerView
+                                android:id="@+id/roll_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="120dp"
+                                android:layout_marginStart="@dimen/dp_20"
+                                android:layout_marginEnd="@dimen/dp_20"
+                                android:layout_marginTop="@dimen/dp_12"
+
+                                app:rollviewpager_hint_gravity="left"
+                                app:rollviewpager_hint_paddingBottom="8dp"
+                                />
+                        </FrameLayout>
+
+
                         <android.support.v7.widget.RecyclerView
                             android:id="@+id/recycler_view"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="6dp"
-                            app:layout_constraintTop_toBottomOf="@+id/roll_view" />
+                            android:visibility="gone"
+                            app:layout_constraintTop_toBottomOf="@+id/fl_roll_view" />
 
                         <android.support.constraint.Group
                             android:id="@+id/home_banner_group"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            app:constraint_referenced_ids="roll_view" />
+                            app:constraint_referenced_ids="fl_roll_view" />
 
                     </android.support.constraint.ConstraintLayout>
 
@@ -98,8 +132,6 @@
                             android:layout_height="wrap_content"
                             >
 
-
-
                             <LinearLayout
                                 android:id="@+id/title_bar"
                                 android:layout_width="match_parent"
@@ -153,18 +185,25 @@
                 </android.support.design.widget.CollapsingToolbarLayout>
 
 
-                <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
-                    android:id="@+id/magic_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:background="@color/white"
-                    android:paddingLeft="14dp"
-                    android:paddingRight="14dp" />
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/color_F9F9F9"
+                    >
+                    <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
+                        android:id="@+id/magic_indicator_bottom"
+                        android:layout_width="wrap_content"
+
+                        android:layout_height="48dp"
+                        android:paddingLeft="14dp"
+                        android:paddingRight="14dp" />
+                </FrameLayout>
+
 
             </android.support.design.widget.AppBarLayout>
 
             <android.support.v4.view.ViewPager
-                android:id="@+id/view_pager"
+                android:id="@+id/view_pager_bottom"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1ea89e435..132c30911 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -523,6 +523,11 @@
     <color name="color_CEC0FF">#CEC0FF</color>
 
     <color name="color_shadow">#05a5a5a5</color>
+    <color name="color_F9F9F9">#F9F9F9</color>
+
+    <color name="color_1CE9E7">#1CE9E7</color>
+    <color name="color_45F1E5">#45F1E5</color>
+    <color name="color_ABAAB2">#ABAAB2</color>
 
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2330223b7..4cbf5830c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,7 +149,7 @@
     <string name="my_fan">我的粉丝</string>
 
     <string name="no_attention_text">你还没有关注任何66陪玩好友哦! \n快去添加关注吧!</string>
-    <string name="search_hint">搜索昵称、ID、房间名</string>
+    <string name="search_hint">搜索昵称/66号/房间名</string>
     <string name="online">在线中…</string>
     <string name="me_customer_server">客服</string>
 
diff --git a/app/src/module_community/res/values/strings.xml b/app/src/module_community/res/values/strings.xml
index ca856d649..5a9bc24bd 100644
--- a/app/src/module_community/res/values/strings.xml
+++ b/app/src/module_community/res/values/strings.xml
@@ -14,6 +14,8 @@
     <string name="dy_comment_text">评论</string>
     <string name="dys_tab_recommend">推荐</string>
     <string name="dys_tab_attent">关注</string>
+    <string name="home_tab_dynamic">动态</string>
+    <string name="home_tab_caht">聊天交友</string>
     <string name="dys_find_tab_square">广场</string>
     <string name="dys_jump_mini_world">去看看</string>
 </resources>
\ No newline at end of file