diff --git a/app/src/main/java/com/shunzhi/parent/api/Consult.java b/app/src/main/java/com/shunzhi/parent/api/Consult.java
index 8b74931..d05eaa7 100644
--- a/app/src/main/java/com/shunzhi/parent/api/Consult.java
+++ b/app/src/main/java/com/shunzhi/parent/api/Consult.java
@@ -15,13 +15,18 @@ import retrofit2.http.Query;
 
 public interface Consult {
 
-    @GET("/api/ParentService/GetAds")
+    @GET("api/ParentService/GetAds")
     Observable<JsonObject> getBanners(@Query("position") String position, @Query("areaName") String areaName);
 
 
     @FormUrlEncoded
-    @POST("/api/ParentService/GetChannelInfo")
+    @POST("api/ParentService/GetChannelInfo")
     Observable<JsonObject> getConsultContent(@Field("areaName") String areaName, @Field("channel") int channel
             , @Field("toFirstPage") int toFirstPage, @Field("pageIndex") int pageIndex);
 
+    @FormUrlEncoded
+    @POST("api/ParentService/GetInformationTopic")
+    Observable<JsonObject> getInformationTopic(@Field("keyword") String keyword,@Field("areaName") String areaName, @Field("channel") String channel
+            , @Field("toFirstPage") String toFirstPage, @Field("pageIndex") int pageIndex);
+
 }
diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
index 4c418b6..7f60cdb 100644
--- a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
@@ -5,6 +5,7 @@ import com.share.mvpsdk.base.BaseModel;
 import com.share.mvpsdk.helper.RetrofitCreateHelper;
 import com.share.mvpsdk.helper.RxHelper;
 import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.api.Consult;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
 
@@ -37,6 +38,11 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo
                 .getConsultContent(areaName,channel,toFirstPage,pageIndex).compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
 
+    @Override
+    public Observable<JsonObject> getInformationTopic(String keyword, String areaName, String channel, String toFirstPage, int pageIndex) {
+        return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
+                .getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).compose(RxHelper.<JsonObject>rxSchedulerHelper());
+    }
 
 
 }
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
index 77ba01c..98053fb 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
@@ -54,7 +54,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
             textAndImgShowView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    ConsultOneLevelActivity.getInstance(mIView.getBindActivity());
+//                    ConsultOneLevelActivity.getInstance(mIView.getBindActivity());
                 }
             });
             layout_control.addView(textAndImgShowView);
@@ -94,7 +94,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
         mRxManager.register(mIModel.getContextChannel(areaName, channel, toFirstPage, pageIndex).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
-                ToastUtils.showToast(jsonObject.toString());
+//                ToastUtils.showToast(jsonObject.toString());
                 JsonObject json=jsonObject.getAsJsonObject("data");
                 Gson g=new Gson();
                 ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class);
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
index 3f4379c..fb80a33 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
@@ -52,7 +52,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
             textAndImgShowView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    ConsultTwoLevelActivity.getInstance(mIView.getBindActivity());
+//                    ConsultTwoLevelActivity.getInstance(mIView.getBindActivity());
                 }
             });
         }
@@ -89,7 +89,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
         mRxManager.register(mIModel.getConsultContent(areaName, channel, toFirstPage, pageIndex).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
-                ToastUtils.showToast(jsonObject.toString());
+//                ToastUtils.showToast(jsonObject.toString());
                 JsonObject json=jsonObject.getAsJsonObject("data");
                 Gson g=new Gson();
                 ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
index 833b3ef..adf15db 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
@@ -2,27 +2,40 @@ package com.shunzhi.parent.ui.activity.consult;
 
 import android.content.Context;
 import android.content.Intent;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.share.mvpsdk.base.activity.BaseCompatActivity;
+import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.ui.fragment.consult.ConsultOneLevelFragment;
 
 public class ConsultOneLevelActivity extends BaseCompatActivity implements View.OnClickListener{
 
 
-    public static void getInstance(Context context){
+    public static void getInstance(Context context,String channel){
         Intent intent=new Intent(context,ConsultOneLevelActivity.class);
+        intent.putExtra("channel",channel);
         context.startActivity(intent);
     }
 
     EditText et_search;
 
     ImageView ivSearch,ivBack;
+
+    String channel="";
+
+    FrameLayout frame_consult;
+
+    FragmentTransaction fragmentTransaction=null;
+
+    ConsultOneLevelFragment consultOneLevelFragment=null;
     @Override
     protected void initView(Bundle savedInstanceState) {
 
@@ -32,12 +45,23 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
 
     private void initViews() {
 
+        channel=getIntent().getStringExtra("channel");
+        consultOneLevelFragment=new ConsultOneLevelFragment();
         et_search=findViewById(R.id.et_search);
         ivSearch=findViewById(R.id.ivSearch);
         ivBack=findViewById(R.id.ivBack);
+        frame_consult=findViewById(R.id.frame_consult);
 
         ivSearch.setOnClickListener(this);
         ivBack.setOnClickListener(this);
+
+        Bundle bundle=new Bundle();
+        bundle.putString("channel",channel);
+        consultOneLevelFragment.setArguments(bundle);
+        ToastUtils.showToast("channel="+channel);
+        fragmentTransaction=getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.frame_consult,consultOneLevelFragment)
+                .show(consultOneLevelFragment).commit();
     }
 
     @Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
index 0521680..7029743 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
@@ -21,8 +21,9 @@ import java.util.List;
 
 public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements View.OnClickListener {
 
-    public static void getInstance(Context context){
+    public static void getInstance(Context context,String channel){
         Intent intent=new Intent(context,ConsultTwoLevelActivity.class);
+        intent.putExtra("channel",channel);
         context.startActivity(intent);
     }
 
@@ -30,7 +31,7 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
 
     EditText et_search;
 
-
+    String channel;
     @Override
     protected void initView(Bundle savedInstanceState) {
         initViews();
@@ -43,7 +44,7 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
 
 
     private void initViews() {
-
+        channel=getIntent().getStringExtra("channel");
         ivBack = findViewById(R.id.ivBack);
         ivBack.setOnClickListener(this);
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
index 6523386..73fe65d 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
@@ -173,7 +173,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
     public void getCity(String name) {
         tvLocalAddress.setText(name.split(" ")[1]);
         mPresenter.getTools(layout_control, name.split(" ")[2]);
-        ToastUtils.showToast(name.split(" ")[2]);
+//        ToastUtils.showToast(name.split(" ")[2]);
     }
 
     @Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index ec506ba..80b07fc 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -196,7 +196,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     }
 
     @Override
-    public void showChannel(List<ChannelBean> list) {
+    public void showChannel(final List<ChannelBean> list) {
         for (int i = 0; i < list.size(); i++) {
             TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity());
             textAndImgShowView.setTextColor(R.color.textColor);
@@ -206,10 +206,12 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
             textAndImgShowView.setSelect(true);
             textAndImgShowView.setWidth(getActivity(), layout_control);
             textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0));
+            textAndImgShowView.setTag(list.get(i));
             textAndImgShowView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    ConsultOneLevelActivity.getInstance(getActivity());
+                    ChannelBean channelBean= (ChannelBean) view.getTag();
+                    ConsultOneLevelActivity.getInstance(getActivity(),channelBean.getId()+"");
                 }
             });
             layout_control.addView(textAndImgShowView);
@@ -233,5 +235,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     @Override
     public void getCity(String name) {
         tvLocalAddress.setText(name.split(" ")[1]);
+        mPresenter.getBanners("2", name.split(" ")[2]);
+        mPresenter.getContextChannel(name.split(" ")[2], 0, 1, 1);
     }
 }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
index 14e5110..d2e8978 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -54,6 +54,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
             @Override
             public void onClick(View view) {
                 startNewActivity(MainActivity.class);
+                getActivity().finish();
             }
         });
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
index 934e085..ded049d 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
@@ -20,6 +20,7 @@ import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.DisplayUtils;
+import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
@@ -31,6 +32,7 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
 import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter;
 import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
+import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;
 import com.shunzhi.parent.util.AttrsUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
 
@@ -49,6 +51,8 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
 
     List<MyConsultBean> myConsultBeanList = null;
 
+    String channel="";
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_consult_one_level;
@@ -79,7 +83,8 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
     }
 
     private void initViews(View view) {
-
+        channel=getArguments().getString("channel");
+        ToastUtils.showToast(channel);
         layout_control = view.findViewById(R.id.layout_control);
         layout_control.measure(0, 0);
 //        mPresenter.getTools(layout_control);
@@ -87,7 +92,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
         recyclerViewConsultOne = view.findViewById(R.id.recyclerViewConsultOne);
 
         mPresenter.getBanners("3", AppContext.getInstance().district);
-        mPresenter.getConsultContent(AppContext.getInstance().district, 42, 0, 1);
+        mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, 1);
 //        initRecyclerViewConsult();
     }
 
@@ -132,8 +137,6 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
 
     @Override
     public void showConsultContent(List<ChannelContextBean> list) {
-//        contextList.clear();
-//        contextList.addAll(list);
         if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
         myConsultAdapter.addAll(list);
         recyclerViewConsultOne.setAdapter(myConsultAdapter);
@@ -150,10 +153,12 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
             textAndImgShowView.setSelect(true);
             textAndImgShowView.setWidth(getActivity(), layout_control);
             textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0));
+            textAndImgShowView.setTag(list.get(i));
             textAndImgShowView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    ConsultOneLevelActivity.getInstance(getActivity());
+                    ChannelBean channelBean= (ChannelBean) view.getTag();
+                    ConsultTwoLevelActivity.getInstance(getActivity(),channelBean.getId()+"");
                 }
             });
             layout_control.addView(textAndImgShowView);
diff --git a/app/src/main/res/layout/activity_consult_one_level.xml b/app/src/main/res/layout/activity_consult_one_level.xml
index cbd95c4..7fcc2b6 100644
--- a/app/src/main/res/layout/activity_consult_one_level.xml
+++ b/app/src/main/res/layout/activity_consult_one_level.xml
@@ -10,11 +10,10 @@
     <include layout="@layout/layout_search_back"/>
 
 
-    <fragment
-        android:id="@+id/MyFragment"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:name="com.shunzhi.parent.ui.fragment.consult.ConsultOneLevelFragment"
-        />
+        android:id="@+id/frame_consult"
+        ></FrameLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 95e8a2b..f074307 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -241,7 +241,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:gravity="center_vertical"
-                    android:layout_height="40dp">
+                    android:layout_height="?android:actionBarSize">
 
                     <TextView
                         android:layout_width="25dp"
@@ -269,7 +269,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
 
                     >
@@ -299,7 +299,7 @@
                     android:background="@color/bottomline" />
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
                     >
 
@@ -324,14 +324,12 @@
             <TextView
                 android:id="@+id/tvExit"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="?android:actionBarSize"
                 android:layout_gravity="center_vertical"
                 android:gravity="center"
                 android:layout_weight="1"
                 android:layout_marginTop="@dimen/size_dp_15"
                 android:layout_marginBottom="@dimen/size_dp_15"
-                android:paddingTop="@dimen/size_dp_5"
-                android:paddingBottom="@dimen/size_dp_5"
                 android:background="@drawable/shape_xueqing_radius8"
                 android:text="退出登录"
                 android:textColor="@color/white"
--
libgit2 0.21.0