no message

姚旭斌
1 parent d878a8a1
Showing 10 changed files with 225 additions and 107 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/AppContext.java
app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
app/src/main/res/layout/activity_consult_two_level.xml
app/src/main/res/layout/fragment_consult_one_level.xml
app/src/main/res/layout/fragment_consult_two_level.xml
app/src/main/res/layout/fragment_zi_xun.xml
mvpsdk/build.gradle
@@ -3,18 +3,17 @@ package com.shunzhi.parent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.util.Log;
 import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
+import com.amap.api.location.AMapLocationClientOption.AMapLocationMode;
 import com.amap.api.location.AMapLocationListener;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.SDKOptions;
 import com.netease.nimlib.sdk.StatusBarNotificationConfig;
 import com.netease.nimlib.sdk.auth.LoginInfo;
 import com.share.mvpsdk.global.GlobalApplication;
-import com.amap.api.location.AMapLocationClientOption.AMapLocationMode;
 /**
  * Created by Administrator on 2018/3/7 0007.
@@ -137,7 +136,8 @@ public class AppContext extends GlobalApplication {
                     sendBroadcast(intent);
                     stopLocation();
                 } else {
-                    cityName = "定位失败";
+                    cityName = "定位失败";district="定位失败";
+
 //                    Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo());
                 }
@@ -2,22 +2,19 @@ package com.shunzhi.parent.ui.activity.consult;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentTransaction;
 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.BasePresenter;
 import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
+import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
-import com.shunzhi.parent.adapter.MyConsultAdapter;
-import com.shunzhi.parent.bean.MyConsultBean;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.shunzhi.parent.ui.fragment.consult.ConsultTwoLevelFragment;
 public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements View.OnClickListener {
@@ -32,6 +29,13 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
     EditText et_search;
     String channel;
+
+    FrameLayout frame_consult;
+
+    ConsultTwoLevelFragment consultTwoLevelFragment;
+
+    FragmentTransaction fragmentTransaction=null;
+
     @Override
     protected void initView(Bundle savedInstanceState) {
         initViews();
@@ -45,13 +49,22 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
     private void initViews() {
         channel=getIntent().getStringExtra("channel");
-        ivBack = findViewById(R.id.ivBack);
-        ivBack.setOnClickListener(this);
-
-        et_search = findViewById(R.id.et_search);
+        consultTwoLevelFragment=new ConsultTwoLevelFragment();
+        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 = findViewById(R.id.ivSearch);
         ivSearch.setOnClickListener(this);
+        ivBack.setOnClickListener(this);
+
+        Bundle bundle=new Bundle();
+        bundle.putString("channel",channel);
+        consultTwoLevelFragment.setArguments(bundle);
+        ToastUtils.showToast("channel="+channel);
+        fragmentTransaction=getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.frame_consult,consultTwoLevelFragment)
+                .show(consultTwoLevelFragment).commit();
     }
@@ -8,13 +8,14 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.bumptech.glide.Glide;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.shunzhi.parent.AppConfig;
@@ -46,7 +47,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     XBanner xBanner;
-    RecyclerView recycler_context;
+    XRecyclerView recycler_context;
     ContextAdapter contextAdapter;
@@ -62,6 +63,9 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     CityPicker cityPicker = null;
+    int pageIndex = 1;
+    boolean first = true;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_zi_xun;
@@ -79,14 +83,16 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         tvLocalAddress = view.findViewById(R.id.tvLocalAddress);
         layout_control = view.findViewById(R.id.layout_control);
-        tvLocalAddress.setText(AppContext.getInstance().cityName);
+   Log.e("aaasasas",AppContext.getInstance().district);
+
+        tvLocalAddress.setText(AppContext.getInstance().district);
         videoplayer.batteryLevel.setVisibility(View.GONE);
         videoplayer.replayTextView.setVisibility(View.GONE);
         videoplayer.backButton.setVisibility(View.GONE);
 //        mPresenter.getTools(layout_control);
         mPresenter.getBanners("2", AppContext.getInstance().district);
-        mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, 1);
+
         initBroadCast();
@@ -95,8 +101,27 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     private void initRecycler() {
         recycler_context.setLayoutManager(new LinearLayoutManager(getActivity()));
-        contextAdapter = new ContextAdapter(getActivity());
+//        contextAdapter = new ContextAdapter(getActivity());
+        recycler_context.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+                //refresh data here
+                pageIndex = 1;
+                contextList.clear();
+                mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex);
+                recycler_context.refreshComplete();
+            }
+            @Override
+            public void onLoadMore() {
+                // load more data here
+                pageIndex = pageIndex + 1;
+                mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex);
+                recycler_context.refreshComplete();
+            }
+        });
+        pageIndex = 1;
+        mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex);
     }
     private void initListeners() {
@@ -117,7 +142,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() {
             @Override
             public void onItemClick(XBanner banner, int position) {
-                WebViewActivity.getInstance(getContext(),imgesUrl.get(position),-1);
+                WebViewActivity.getInstance(getContext(), imgesUrl.get(position), -1);
             }
         });
@@ -169,7 +194,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals(AppContext.LOCATION_CITYNAME + "")) {
-                tvLocalAddress.setText(AppContext.getInstance().cityName);
+                tvLocalAddress.setText(AppContext.getInstance().district);
             }
         }
     };
@@ -197,47 +222,54 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     @Override
     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);
-            textAndImgShowView.setText(list.get(i).getChannelName());
+        if (first) {
+            layout_control.removeAllViews();
+            for (int i = 0; i < list.size(); i++) {
+                TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity());
+                textAndImgShowView.setTextColor(R.color.textColor);
+                textAndImgShowView.setText(list.get(i).getChannelName());
 //            textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage()));
-            textAndImgShowView.addImgs(list.get(i).getChannelImage());
-            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) {
-                    ChannelBean channelBean= (ChannelBean) view.getTag();
-                    ConsultOneLevelActivity.getInstance(getActivity(),channelBean.getId()+"");
-                }
-            });
-            layout_control.addView(textAndImgShowView);
+                textAndImgShowView.addImgs(list.get(i).getChannelImage());
+                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) {
+                        ChannelBean channelBean = (ChannelBean) view.getTag();
+                        ConsultOneLevelActivity.getInstance(getActivity(), channelBean.getId() + "");
+                    }
+                });
+                layout_control.addView(textAndImgShowView);
+            }
+            first = false;
         }
-
-
     }
     @Override
     public void showContext(List<ChannelContextBean> list) {
-        contextList.clear();
+        Log.e("aaaadxasdas-===", "111111");
         contextList.addAll(list);
-        contextAdapter.addAll(contextList);
-        recycler_context.setAdapter(contextAdapter);
-
-
+        if (contextAdapter == null) {
+            contextAdapter = new ContextAdapter(getActivity());
+            contextAdapter.addAll(contextList);
+            recycler_context.setAdapter(contextAdapter);
+        } else {
+            contextAdapter.addAll(contextList);
+            contextAdapter.notifyDataSetChanged();
+        }
     }
     @Override
     public void getCity(String name) {
+        first=true;
         tvLocalAddress.setText(name.split(" ")[1]);
         mPresenter.getBanners("2", name.split(" ")[2]);
         mPresenter.getContextChannel(name.split(" ")[2], 0, 1, 1);
-        AppContext.getInstance().cityName=name.split(" ")[1];
-        AppContext.getInstance().district=name.split(" ")[2];
+        AppContext.getInstance().cityName = name.split(" ")[1];
+        AppContext.getInstance().district = name.split(" ")[2];
     }
 }
@@ -5,7 +5,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +14,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.bumptech.glide.Glide;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
@@ -26,22 +26,22 @@ import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.adapter.MyConsultAdapter;
 import com.shunzhi.parent.bean.GuangGaoBean;
-import com.shunzhi.parent.bean.MyConsultBean;
 import com.shunzhi.parent.bean.channel.ChannelBean;
 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;
+import java.util.ArrayList;
 import java.util.List;
 public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneContract.ConsultOnePresenter,
         ConsultOneContract.IConsultOneModel> implements View.OnClickListener, ConsultOneContract.IConsultOneView {
-    RecyclerView recyclerViewGrally, recyclerViewConsultOne;
+    RecyclerView recyclerViewGrally;
+    XRecyclerView recyclerViewConsultOne;
     MyGrallyAdapter myGrallyAdapter = null;
@@ -49,9 +49,11 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     LinearLayout layout_control;
-    List<MyConsultBean> myConsultBeanList = null;
+    List<ChannelContextBean> myConsultBeanList = new ArrayList<>();
+    boolean first=true;
-    String channel="";
+    String channel = "";
+    int pageIndex;
     @Override
     public int getLayoutId() {
@@ -60,7 +62,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
-            initViews(view);
+        initViews(view);
     }
     private void initRecyclerView(List<GuangGaoBean> guangGaoBeanList) {
@@ -83,16 +85,37 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     }
     private void initViews(View view) {
-        channel=getArguments().getString("channel");
+        channel = getArguments().getString("channel");
         ToastUtils.showToast(channel);
         layout_control = view.findViewById(R.id.layout_control);
         layout_control.measure(0, 0);
 //        mPresenter.getTools(layout_control);
         recyclerViewGrally = view.findViewById(R.id.recyclerViewGrally);
         recyclerViewConsultOne = view.findViewById(R.id.recyclerViewConsultOne);
+        recyclerViewConsultOne.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerViewConsultOne.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+                //refresh data here
+                pageIndex = 1;
+                myConsultBeanList.clear();
+                mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
+                recyclerViewConsultOne.refreshComplete();
+            }
+
+            @Override
+            public void onLoadMore() {
+                // load more data here
+                pageIndex = pageIndex + 1;
+                mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
+                recyclerViewConsultOne.refreshComplete();
+            }
+        });
+        pageIndex = 1;
+        mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
         mPresenter.getBanners("3", AppContext.getInstance().district);
-        mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, 1);
+
 //        initRecyclerViewConsult();
     }
@@ -137,31 +160,43 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     @Override
     public void showConsultContent(List<ChannelContextBean> list) {
-        if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
-        myConsultAdapter.addAll(list);
-        recyclerViewConsultOne.setAdapter(myConsultAdapter);
+        myConsultBeanList.addAll(list);
+        if (myConsultAdapter == null) {
+            myConsultAdapter = new MyConsultAdapter(getActivity());
+            myConsultAdapter.addAll(myConsultBeanList);
+            recyclerViewConsultOne.setAdapter(myConsultAdapter);
+        } else {
+            myConsultAdapter.addAll(myConsultBeanList);
+            myConsultAdapter.notifyDataSetChanged();
+        }
+//        if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
+//        myConsultAdapter.addAll(list);
+//        recyclerViewConsultOne.setAdapter(myConsultAdapter);
     }
     @Override
     public void showChannel(List<ChannelBean> list) {
-        for (int i = 0; i < list.size(); i++) {
-            TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity());
-            textAndImgShowView.setTextColor(R.color.textColor);
-            textAndImgShowView.setText(list.get(i).getChannelName());
+        if(first) {
+            for (int i = 0; i < list.size(); i++) {
+                TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity());
+                textAndImgShowView.setTextColor(R.color.textColor);
+                textAndImgShowView.setText(list.get(i).getChannelName());
 //            textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage()));
-            textAndImgShowView.addImgs(list.get(i).getChannelImage());
-            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) {
-                    ChannelBean channelBean= (ChannelBean) view.getTag();
-                    ConsultTwoLevelActivity.getInstance(getActivity(),channelBean.getId()+"");
-                }
-            });
-            layout_control.addView(textAndImgShowView);
+                textAndImgShowView.addImgs(list.get(i).getChannelImage());
+                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) {
+                        ChannelBean channelBean = (ChannelBean) view.getTag();
+                        ConsultTwoLevelActivity.getInstance(getActivity(), channelBean.getId() + "");
+                    }
+                });
+                layout_control.addView(textAndImgShowView);
+            }
+            first=false;
         }
     }
@@ -199,8 +234,8 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
             @Override
             public void onBindViewHolder(GuangGaoBean object, int position) {
-                Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG+object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
-                tv_grally_title.setText(object.describe+"");
+                Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG + object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
+                tv_grally_title.setText(object.describe + "");
             }
         }
     }
@@ -3,16 +3,17 @@ package com.shunzhi.parent.ui.fragment.consult;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.TextView;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.adapter.MyConsultAdapter;
 import com.shunzhi.parent.bean.GuangGaoBean;
-import com.shunzhi.parent.bean.MyConsultBean;
 import com.shunzhi.parent.bean.channel.ChannelBean;
 import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
@@ -29,11 +30,14 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     TextView tvContentName;
-    RecyclerView recyclerView;
+    XRecyclerView recyclerView;
     MyConsultAdapter myConsultAdapter = null;
-    List<MyConsultBean> myConsultBeanList = new ArrayList<>();
+    List<ChannelContextBean> myConsultBeanList = new ArrayList<>();
+
+    int pageIndex = 1;
+    String channel;
     @Override
     public int getLayoutId() {
@@ -44,8 +48,30 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         tvContentName = view.findViewById(R.id.tvContentName);
         tvContentName.setText("");
-
         recyclerView = view.findViewById(R.id.recyclerView);
+        channel = getArguments().getString("channel");
+        recyclerView = view.findViewById(R.id.recyclerViewConsultOne);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerView.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+                //refresh data here
+                pageIndex = 1;
+                myConsultBeanList.clear();
+                mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
+                recyclerView.refreshComplete();
+            }
+
+            @Override
+            public void onLoadMore() {
+                // load more data here
+                pageIndex = pageIndex + 1;
+                mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
+                recyclerView.refreshComplete();
+            }
+        });
+        pageIndex = 1;
+        mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
 //        initRecyclerView();
     }
@@ -83,7 +109,15 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     @Override
     public void showConsultContent(List<ChannelContextBean> list) {
-
+        myConsultBeanList.addAll(list);
+        if (myConsultAdapter == null) {
+            myConsultAdapter = new MyConsultAdapter(getActivity());
+            myConsultAdapter.addAll(myConsultBeanList);
+            recyclerView.setAdapter(myConsultAdapter);
+        } else {
+            myConsultAdapter.addAll(myConsultBeanList);
+            myConsultAdapter.notifyDataSetChanged();
+        }
     }
     @Override
@@ -92,5 +126,4 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     }
-
 }
@@ -9,5 +9,9 @@
     tools:context="com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity">
 <include layout="@layout/layout_search_back"/>
-
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/frame_consult"
+        ></FrameLayout>
 </LinearLayout>
@@ -19,12 +19,12 @@
     <include layout="@layout/layout_textandimgshow"/>
-    <android.support.v7.widget.RecyclerView
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:layout_marginTop="@dimen/size_dp_10"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="3"
         android:id="@+id/recyclerViewConsultOne"
-        ></android.support.v7.widget.RecyclerView>
+        ></com.jcodecraeer.xrecyclerview.XRecyclerView>
 </LinearLayout>
@@ -17,12 +17,14 @@
         android:paddingBottom="@dimen/size_dp_5"
         />
-    <android.support.v7.widget.RecyclerView
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:layout_marginLeft="@dimen/size_dp_10"
         android:layout_marginRight="@dimen/size_dp_10"
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
+        android:layout_height="match_parent">
+
+    </com.jcodecraeer.xrecyclerview.XRecyclerView>
 </LinearLayout>
@@ -14,23 +14,17 @@
         android:layout_height="0dp"
         android:layout_weight="2"></com.stx.xhb.xbanner.XBanner>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/size_dp_10"
-        android:layout_marginLeft="@dimen/size_dp_10"
-        android:layout_marginRight="@dimen/size_dp_10"
-        >
 <include layout="@layout/layout_textandimgshow"
     />
-    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:paddingLeft="@dimen/size_dp_10"
         android:paddingRight="@dimen/size_dp_10"
+        android:layout_weight="3"
         android:orientation="vertical">
         <TextView
@@ -44,18 +38,19 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recycler_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-        </android.support.v7.widget.RecyclerView>
+            <com.jcodecraeer.xrecyclerview.XRecyclerView
+                android:id="@+id/recycler_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+            </com.jcodecraeer.xrecyclerview.XRecyclerView>
         </LinearLayout>
     </LinearLayout>
     <FrameLayout
         android:layout_width="match_parent"
+        android:visibility="gone"
         android:layout_height="0dp"
         android:layout_margin="@dimen/size_dp_10"
         android:layout_weight="2">
@@ -63,7 +58,8 @@
         <cn.jzvd.JZVideoPlayerStandard
             android:id="@+id/videoplayer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"></cn.jzvd.JZVideoPlayerStandard>
+            android:layout_height="match_parent"
+            ></cn.jzvd.JZVideoPlayerStandard>
         <TextView
             android:id="@+id/tvVideoTitle"
@@ -116,6 +116,9 @@ dependencies {
     //标签拖动排序
     compile 'com.huxq17.handygridview:handygridview:1.1.0'
+    //xrecyclerview
+    compile 'com.jcodecraeer:xrecyclerview:1.5.9'
+
     //悬浮窗
 //    compile 'com.github.yhaolpz:FloatWindow:1.0.8'
	@@ -19,12 +19,12 @@		@@ -19,12 +19,12 @@
19		19
20	<include layout="@layout/layout_textandimgshow"/>	20	<include layout="@layout/layout_textandimgshow"/>
21		21
22	- <android.support.v7.widget.RecyclerView	22	+ <com.jcodecraeer.xrecyclerview.XRecyclerView
23	android:layout_marginTop="@dimen/size_dp_10"	23	android:layout_marginTop="@dimen/size_dp_10"
24	android:layout_width="match_parent"	24	android:layout_width="match_parent"
25	android:layout_height="0dp"	25	android:layout_height="0dp"
26	android:layout_weight="3"	26	android:layout_weight="3"
27	android:id="@+id/recyclerViewConsultOne"	27	android:id="@+id/recyclerViewConsultOne"
28	- ></android.support.v7.widget.RecyclerView>	28	+ ></com.jcodecraeer.xrecyclerview.XRecyclerView>
29		29
30	</LinearLayout>	30	</LinearLayout>