From 0a3dbbab716b30134717ce770bc50d363bb0b0e1 Mon Sep 17 00:00:00 2001
From: taohd <2821744554@qq.com>
Date: Sat, 5 May 2018 10:55:37 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                 |  2 ++
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 33 +++++++++++++++++++++++++++------
 app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java       |  2 +-
 app/src/main/res/layout/fragment_consult_one_level.xml                                | 43 ++++++++++++++++++++++++++++---------------
 4 files changed, 58 insertions(+), 22 deletions(-)

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 49002a2..6212ab0 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
@@ -300,6 +300,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     @Override
     public void getCity(String name) {
         first = true;
+        contextList.clear();
         tvLocalAddress.setText(name.split(" ")[2]);
         mPresenter.getBanners("2", name.split(" ")[2]);
         mPresenter.getContextChannel(name.split(" ")[2], 0, 1, 1);
@@ -310,6 +311,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
 
     public void refresh() {
         first = true;
+        contextList.clear();
         districtName=AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.DISTRICT);
         tvLocalAddress.setText(districtName);
         mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex);
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 3179595..645c696 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
@@ -1,8 +1,10 @@
 package com.shunzhi.parent.ui.fragment.consult;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -40,17 +42,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneContract.ConsultOnePresenter,
-        ConsultOneContract.IConsultOneModel> implements View.OnClickListener, ConsultOneContract.IConsultOneView {
-
-    RecyclerView recyclerViewGrally;
-    XRecyclerView recyclerViewConsultOne;
+        ConsultOneContract.IConsultOneModel> implements View.OnClickListener, ConsultOneContract.IConsultOneView,SwipeRefreshLayout.OnRefreshListener {
 
+    RecyclerView recyclerViewGrally,recyclerViewConsultOne;
     MyGrallyAdapter myGrallyAdapter = null;
 
     MyConsultAdapter myConsultAdapter = null;
 
     LinearLayout layout_control;
 
+    SwipeRefreshLayout swipeRefreshLayout;
+
 
     List<ChannelContextBean> myConsultBeanList = new ArrayList<>();
 
@@ -74,8 +76,15 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
         layout_control.measure(0, 0);
         recyclerViewGrally = view.findViewById(R.id.recyclerViewGrally);
         recyclerViewConsultOne = view.findViewById(R.id.recyclerViewConsultOne);
+        swipeRefreshLayout=view.findViewById(R.id.swipeRefreshLayout);
+
+        swipeRefreshLayout.setOnRefreshListener(this);
+        swipeRefreshLayout.setColorSchemeResources(android.R.color.holo_blue_bright,
+                android.R.color.holo_green_light,
+                android.R.color.holo_orange_light,
+                android.R.color.holo_red_light);
 
-        recyclerViewConsultOne.setLayoutManager(new LinearLayoutManager(getActivity()));
+        /*recyclerViewConsultOne.setLayoutManager(new LinearLayoutManager(getActivity()));
         recyclerViewConsultOne.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
             public void onRefresh() {
@@ -93,7 +102,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
                 mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
                 recyclerViewConsultOne.refreshComplete();
             }
-        });
+        });*/
         pageIndex = 1;
         mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
 
@@ -188,6 +197,18 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
         }
     }
 
+    @Override
+    public void onRefresh() {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                swipeRefreshLayout.setRefreshing(false);
+                myConsultBeanList.clear();
+                mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
+            }
+        },3000);
+    }
+
     private class MyGrallyAdapter extends BaseRecyclerViewAdapter<GuangGaoBean> {
         @Override
         public void onAttachedToRecyclerView(RecyclerView recyclerView) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
index d4b3385..84fd85e 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
@@ -202,7 +202,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
     }
 
     private void showOrderPopu(){
-        if (childBean.getCount() == 0) {
+        if (null==childBean||childBean.getCount() == 0) {
             final PopupWindow popupWindow = new PopupWindow();
             popupWindow.setWidth(ViewGroup.LayoutParams.MATCH_PARENT);
             popupWindow.setHeight(ViewGroup.LayoutParams.MATCH_PARENT);
diff --git a/app/src/main/res/layout/fragment_consult_one_level.xml b/app/src/main/res/layout/fragment_consult_one_level.xml
index e27a65e..dda26ce 100644
--- a/app/src/main/res/layout/fragment_consult_one_level.xml
+++ b/app/src/main/res/layout/fragment_consult_one_level.xml
@@ -2,26 +2,39 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/bgColor"
+    android:orientation="vertical"
     tools:context="com.shunzhi.parent.ui.fragment.consult.ConsultOneLevelFragment">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recyclerViewGrally"
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
-        android:layout_height="180dp"
-        android:background="@color/bgColor"
-        ></android.support.v7.widget.RecyclerView>
+        android:layout_height="match_parent"
+        android:visibility="visible">
+        <android.support.v4.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-    <include layout="@layout/layout_textandimgshow"/>
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recyclerViewGrally"
+                android:layout_width="match_parent"
+                android:layout_height="180dp"
+                android:background="@color/bgColor"></android.support.v7.widget.RecyclerView>
 
-    <com.jcodecraeer.xrecyclerview.XRecyclerView
-        android:layout_marginTop="@dimen/size_dp_10"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/size_dp_10"
-        android:layout_marginRight="@dimen/size_dp_10"
-        android:id="@+id/recyclerViewConsultOne"
-        ></com.jcodecraeer.xrecyclerview.XRecyclerView>
+            <include layout="@layout/layout_textandimgshow" />
 
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recyclerViewConsultOne"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/size_dp_10"
+                android:layout_marginRight="@dimen/size_dp_10"
+                android:layout_marginTop="@dimen/size_dp_10"></android.support.v7.widget.RecyclerView>
+        </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
+    </android.support.v4.widget.SwipeRefreshLayout>
 </LinearLayout>
--
libgit2 0.21.0