no message

张道锋
2 parents e518b71b 9b095404
Showing 71 changed files with 1314 additions and 678 deletions Show diff stats
.idea/inspectionProfiles/profiles_settings.xml
.idea/modules.xml
app/src/main/AndroidManifest.xml
app/src/main/java/com/shunzhi/parent/AppConfig.java
app/src/main/java/com/shunzhi/parent/AppContext.java
app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
app/src/main/java/com/shunzhi/parent/adapter/ContextAdapter.java
app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
app/src/main/java/com/shunzhi/parent/api/Consult.java
app/src/main/java/com/shunzhi/parent/bean/ToolBean.java
app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java
app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java
app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" />
+    <version value="1.0" />
+  </settings>
+</component>
 \ No newline at end of file
@@ -4,8 +4,8 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
-      <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
       <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />
+      <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
       <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" />
       <module fileurl="file://$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" filepath="$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" />
     </modules>
@@ -112,7 +112,8 @@
             android:name="com.amap.api.v2.apikey"
             android:value="1d130afb822d8a1019e6592cbaf10bcc"/>
-        <activity android:name=".ui.MainActivity"
+        <activity android:name=".ui.activity.StartActivity"
+            android:launchMode="singleInstance"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -130,40 +131,54 @@
         <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"/>
         <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> -->
         <activity
-            android:name=".ui.activity.StartActivity"
+            android:name=".ui.MainActivity"
+            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
             android:screenOrientation="portrait"/>
         <activity
             android:name=".ui.activity.ChildDetialActivity"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.binding.CreateChildInfoActivity"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"/>
         <activity
             android:name=".ui.activity.binding.SelectSchoolActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"/>
-            android:windowSoftInputMode="adjustPan|stateHidden" />
+
          <activity android:name=".ui.activity.LoginAndRegistActivity"
          android:screenOrientation="portrait"
          />
         <activity
             android:name=".ui.activity.PersonInfoActivity"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"/>
+
         <activity
             android:name=".ui.activity.binding.CheckInfoActivity"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden"/>
+
         <activity
             android:name=".ui.activity.binding.InviteCodeActivity"
-
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".ui.activity.mywebview.WebViewActivity"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait" />
-        <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity" />
-        <activity android:name=".ui.activity.orderdetail.OrderDetailActivity" />
+
+        <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity"
+            android:launchMode="singleInstance"/>
+
+        <activity android:name=".ui.activity.orderdetail.OrderDetailActivity"
+            android:launchMode="singleInstance"/>
     </application>
 </manifest>
 \ No newline at end of file
@@ -22,7 +22,10 @@ public class AppConfig {
     public static String USER_SEX = "user_sex";
     public static String USER_IMAGE = "user_image";
     public static String PARENT_ID = "parent_id";
+
+
     public static boolean ISLOGIN = false;
+    public static boolean ISBINDING = false;
     public static int BINDING_SUCCESS_HEZUO = 1;
     public static int BINDING_SUCCESS_NOT = 2;
@@ -33,8 +36,8 @@ public class AppConfig {
     //http://campus.myjxt.com/
     public static String BASE_URL="http://60.190.202.57:1000/";
-    public static String BASE_URL_IMG="http://60.190.202.57:1000";
     public static String BASE_URL_ORDER="http://60.190.202.57:8101/";
+    public static String BASE_URL_FILE="http://60.190.202.57:8196";
     //默认日志保存的路径
@@ -3,11 +3,11 @@ 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;
@@ -161,7 +161,8 @@ public class AppContext extends GlobalApplication {
                     sendBroadcast(intent);
                     stopLocation();
                 } else {
-                    cityName = "定位失败";
+                    cityName = "定位失败";district="定位失败";
+
 //                    Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo());
                 }
@@ -11,9 +11,12 @@ import android.widget.TextView;
 import com.google.gson.Gson;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.ChildBean;
 import com.shunzhi.parent.ui.activity.ChildDetialActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 /**
  * Created by Administrator on 2018/3/9 0009.
@@ -37,26 +40,42 @@ public class ChildAdapter extends BaseRecyclerViewAdapter&lt;ChildBean&gt; {
     private class MyViewHolder extends BaseRecyclerViewHolder<ChildBean> {
         TextView txt_childname, txt_childclass;
+        TextView go_buy;
         public MyViewHolder(View view) {
             super(view);
             txt_childname = view.findViewById(R.id.txt_childname);
             txt_childclass = view.findViewById(R.id.txt_childclass);
+            go_buy = view.findViewById(R.id.go_buy);
+
         }
         @Override
         public void onBindViewHolder(final ChildBean object, int position) {
-            txt_childname.setText(object.getStudentName());
-            txt_childclass.setText(object.getSchoolName() + "    " + object.getClassName());
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Gson g = new Gson();
-                    String jsonString = g.toJson(object, ChildBean.class).toString();
-                    context.startActivity(new Intent().putExtra("childJson", jsonString).setClass(context, ChildDetialActivity.class));
-                }
-            });
+            try {
+                txt_childname.setText(object.getStudentName());
+                txt_childclass.setText(object.getSchoolName() + "    " + object.getClassName());
+                itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Gson g = new Gson();
+                        String jsonString = g.toJson(object, ChildBean.class).toString();
+                        context.startActivity(new Intent().putExtra("childJson", jsonString).setClass(context, ChildDetialActivity.class));
+                    }
+                });
+
+                go_buy.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        WebViewActivity.getInstance(context,
+                                AppConfig.BASE_URL_ORDER + "/ParentOrderCenter.aspx?userid=" +
+                                        AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID), AppConfig.ORDER_CENTER);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
@@ -1,66 +0,0 @@
-package com.shunzhi.parent.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
-import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
-import com.shunzhi.parent.R;
-import com.shunzhi.parent.bean.channel.ChannelContextBean;
-
-/**
- * Created by lenovo on 2018/3/18.
- */
-
-public class ContextAdapter  extends BaseRecyclerViewAdapter<ChannelContextBean>{
-    Context context;
-
-    public ContextAdapter(Context context) {
-        this.context = context;
-    }
-
-
-    @Override
-    public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(context).inflate(R.layout.layout_consult_content, null);
-        return new MyViewHolder(view);
-    }
-
-    private class MyViewHolder extends BaseRecyclerViewHolder<ChannelContextBean> {
-        TextView tvConsultTitle,tvConsultContent,tvPingLunNums,tvZhuanFaNums;
-        ImageView iv_consult;
-
-
-        public MyViewHolder(View view) {
-            super(view);
-            tvConsultContent=view.findViewById(R.id.tvConsultContent);
-            tvConsultTitle=view.findViewById(R.id.tvConsultTitle);
-            tvPingLunNums=view.findViewById(R.id.tvPingLunNums);
-            tvZhuanFaNums=view.findViewById(R.id.tvZhuanFaNums);
-            iv_consult=view.findViewById(R.id.iv_consult);
-
-        }
-
-        @Override
-        public void onBindViewHolder(final ChannelContextBean object, int position) {
-            tvConsultTitle.setText(object.getTitle());
-            tvConsultContent.setText(object.getContent());
-            Glide.with(context).load(object.getImage()).placeholder(R.color.xueqing_blue)
-                    .into(iv_consult);
-
-
-
-
-
-        }
-
-    }
-
-
-
-}
@@ -3,34 +3,41 @@ package com.shunzhi.parent.adapter;
 import android.content.Context;
 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;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.bumptech.glide.Glide;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
-import com.shunzhi.parent.bean.MyConsultBean;
-import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;
+import com.shunzhi.parent.bean.channel.ChannelContextBean;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
+import com.shunzhi.parent.util.GlideUtils;
 /**
  * Created by ToaHanDong on 2018/3/14.
  */
-public class MyConsultAdapter extends BaseRecyclerViewAdapter<MyConsultBean> {
+public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean> {
-    private Context mContext=null;
+    private Context mContext = null;
-    public MyConsultAdapter(Context context){
-        mContext=context;
+    public MyConsultAdapter(Context context) {
+        mContext = context;
     }
     @Override
     public void onAttachedToRecyclerView(RecyclerView recyclerView) {
         super.onAttachedToRecyclerView(recyclerView);
-        LinearLayoutManager layoutManager=new LinearLayoutManager(mContext);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(mContext);
         layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         recyclerView.setLayoutManager(layoutManager);
     }
@@ -41,25 +48,52 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter&lt;MyConsultBean&gt; {
         return new MyConsultViewHolder(view);
     }
-    private class MyConsultViewHolder extends BaseRecyclerViewHolder<MyConsultBean>{
+    private class MyConsultViewHolder extends BaseRecyclerViewHolder<ChannelContextBean> {
         TextView tvConsultTitle, tvConsultContent, tvPingLunNums, tvZhuanFaNums;
-        ImageView iv_consult;
+        ImageView iv_consult, image_ad;
+        FrameLayout frame_ad;
+        LinearLayout normal_content;
+
         public MyConsultViewHolder(View itemView) {
             super(itemView);
-            tvConsultTitle = itemView.findViewById(R.id.tvConsultTitle);
             tvConsultContent = itemView.findViewById(R.id.tvConsultContent);
+            tvConsultTitle = itemView.findViewById(R.id.tvConsultTitle);
             tvPingLunNums = itemView.findViewById(R.id.tvPingLunNums);
             tvZhuanFaNums = itemView.findViewById(R.id.tvZhuanFaNums);
             iv_consult = itemView.findViewById(R.id.iv_consult);
+            frame_ad = itemView.findViewById(R.id.frame_ad);
+            image_ad = itemView.findViewById(R.id.image_ad);
+            normal_content = itemView.findViewById(R.id.normal_content);
         }
         @Override
-        public void onBindViewHolder(MyConsultBean object, int position) {
-            tvConsultContent.setText(object.consultContent);
-            tvConsultTitle.setText(object.consultTitle);
-            tvPingLunNums.setText(object.consultCounts);
-            tvZhuanFaNums.setText(object.consultZhuanfaCounts);
+        public void onBindViewHolder(final ChannelContextBean object, int position) {
+            if (object.getIsAds() == 1) {
+                frame_ad.setVisibility(View.VISIBLE);
+                normal_content.setVisibility(View.GONE);
+                GlideUtils.showImg(mContext,iv_consult,object.getImage());
+                frame_ad.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        WebViewActivity.getInstance(mContext,object.getUrl(), -1);
+                    }
+                });
+            } else {
+                frame_ad.setVisibility(View.GONE);
+                normal_content.setVisibility(View.VISIBLE);
+                tvConsultTitle.setText(object.getTitle());
+                tvConsultContent.setText(object.getContent());
+                GlideUtils.showImg(mContext,iv_consult,object.getImage());
+                normal_content.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        WebViewActivity.getInstance(mContext, AppConfig.BASE_URL_ORDER
+                                +"InformationDetail.aspx?id="+object.getId()+"&areaname="+ AppContext.getInstance().district, -1);
+                    }
+                });
+            }
+
         }
     }
 }
@@ -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);
+
 }
@@ -5,17 +5,17 @@ import java.io.Serializable;
 /**
  * Created by ToaHanDong on 2018/3/14.
  * toolId (integer, optional): 工具ID ,
- toolName (string, optional): 工具名称 ,
- toolImage (string, optional): 工具图片 ,
- toolUrl (string, optional): 工具链接 ,
- orderById (integer, optional): 工具排序
+ * toolName (string, optional): 工具名称 ,
+ * toolImage (string, optional): 工具图片 ,
+ * toolUrl (string, optional): 工具链接 ,
+ * orderById (integer, optional): 工具排序
  */
 public class ToolBean implements Serializable {
-    public ToolBean(String toolImg,String toolName){
-        this.toolImage=toolImg;
-        this.toolName=toolName;
+    public ToolBean(String toolImg, String toolName) {
+        this.toolImage = toolImg;
+        this.toolName = toolName;
     }
@@ -25,13 +25,21 @@ public class ToolBean implements Serializable {
     public String toolUrl;
+    public String toolId;
+    public String columnType;
+
+    public String orderById;
     @Override
     public String toString() {
         return "ToolBean{" +
-                "toolImg='" + toolImage + '' +
+                "toolImage='" + toolImage + '' +
                 ", toolName='" + toolName + '\'' +
+                ", toolUrl='" + toolUrl + '\'' +
+                ", toolId='" + toolId + '\'' +
+                ", columnType='" + columnType + '\'' +
+                ", orderById='" + orderById + '\'' +
                 '}';
     }
 }
@@ -31,7 +31,7 @@ public interface CepingContract {
     interface ICePingView extends IBaseFragment{
-        void showTools();
+        void showTools(List<ToolBean> toolBeanList);
     }
@@ -7,6 +7,8 @@ import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.IBaseFragment;
 import com.share.mvpsdk.base.IBaseModel;
 import com.shunzhi.parent.bean.GuangGaoBean;
+import com.shunzhi.parent.bean.channel.ChannelBean;
+import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import java.util.List;
@@ -24,6 +26,8 @@ public interface ConsultOneContract {
         public abstract void getBanners(String position,String areaName);
         public abstract void getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex);
+
+        public abstract void getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex);
     }
     interface IConsultOneModel extends IBaseModel{
@@ -32,6 +36,8 @@ public interface ConsultOneContract {
         Observable<JsonObject> getBanners(String position,String areaName);
         Observable<JsonObject> getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex);
+
+        Observable<JsonObject> getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex);
     }
     interface IConsultOneView extends IBaseFragment{
@@ -39,7 +45,9 @@ public interface ConsultOneContract {
         void showBanners(List<GuangGaoBean> guangGaoBeanList);
-        void showConsultContent();
+        void showConsultContent(List<ChannelContextBean> list);
+
+        void showChannel(List<ChannelBean> list);
     }
@@ -45,6 +45,7 @@ public interface LoginAndRegisterContract {
         //更新用户信息
         void getUserInfo(int type);
+        void showerror(String error);
     }
@@ -41,7 +41,7 @@ public interface MyChildContract {
     interface IMyChildView extends IBaseActivity {
         void updateChildList(CurrentBean currentBean);
-        void addChildSuccess();
+        void addChildSuccess(String account,String password);
         void showClass(List<ChildClass>list);
         void showError(String error);
@@ -6,8 +6,6 @@ import com.share.mvpsdk.helper.RetrofitCreateHelper;
 import com.share.mvpsdk.helper.RxHelper;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.api.Consult;
-import com.shunzhi.parent.api.LoginRegisterApi;
-import com.shunzhi.parent.bean.UserInfo;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import io.reactivex.Observable;
@@ -32,8 +30,6 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM
     @Override
     public Observable<JsonObject> getContextChannel(String areaName, int channel, int toFirstPage, int pageIndex) {
-//        return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
-//                .getConsultContent(areaName,channel,toFirstPage,pageIndex);
         return RetrofitCreateHelper.getInstance().createApi(Consult.class,AppConfig.BASE_URL).getConsultContent(areaName,channel,toFirstPage,pageIndex)
                 .compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
@@ -5,8 +5,8 @@ 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.bean.GuangGaoBean;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
 import io.reactivex.Observable;
@@ -35,6 +35,14 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo
     @Override
     public Observable<JsonObject> getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex) {
         return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
-                .getConsultContent(areaName,channel,toFirstPage,pageIndex);
+                .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());
+    }
+
+
 }
 package com.shunzhi.parent.presenter.ceping;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -14,7 +15,11 @@ import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.util.AttrsUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
+import java.util.ArrayList;
+import java.util.List;
+
 import io.reactivex.functions.Consumer;
+import timber.log.Timber;
 /**
  * Created by ToaHanDong on 2018/3/14.
@@ -38,29 +43,36 @@ public class CePingPresenter extends CepingContract.CePingPresenter {
         mRxManager.register(mIModel.getTools(areaName).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
+
                 if (jsonObject.get("status").getAsString().equals("1")){
                     JsonArray jsonArray=jsonObject.getAsJsonArray("data");
                     layout_control.removeAllViews();
+                    List<ToolBean> toolBeanList=new ArrayList<>();
                     for (int i = 0; i < jsonArray.size(); i++) {
                         ToolBean toolBean=new Gson().fromJson(jsonArray.get(i).getAsJsonObject(),ToolBean.class);
-                        TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity());
-                        textAndImgShowView.setTextColor(R.color.textColor);
-                        textAndImgShowView.setText(toolBean.toolName);
-                        textAndImgShowView.addImgs(toolBean.toolImage);
-                        textAndImgShowView.setSelect(true);
-                        textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control);
-                        textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0));
-                        textAndImgShowView.setTag(toolBean);
-                        textAndImgShowView.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View view) {
-                                ToolBean toolBean1= (ToolBean) view.getTag();
-                                WebViewActivity.getInstance(mIView.getBindActivity(),toolBean1.toolUrl,-1);
-                            }
-                        });
-                        layout_control.addView(textAndImgShowView);
-                        mIView.showTools();
+                        if (toolBean.columnType.equals("2")){
+                            TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity());
+                            textAndImgShowView.setTextColor(R.color.textColor);
+                            textAndImgShowView.setText(toolBean.toolName);
+                            textAndImgShowView.addImgs(toolBean.toolImage);
+                            textAndImgShowView.setSelect(true);
+                            textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control);
+                            textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0));
+                            textAndImgShowView.setTag(toolBean);
+                            textAndImgShowView.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    ToolBean toolBean1= (ToolBean) view.getTag();
+                                    WebViewActivity.getInstance(mIView.getBindActivity(),toolBean1.toolUrl,-1);
+                                }
+                            });
+                            layout_control.addView(textAndImgShowView);
+                        } else  if (toolBean.columnType.equals("1")){
+                            //活动
+                            toolBeanList.add(toolBean);
+                        }
                     }
+                    mIView.showTools(toolBeanList);
                 }else {
                 }
@@ -71,27 +83,5 @@ public class CePingPresenter extends CepingContract.CePingPresenter {
             }
         }));
-        /*List<ToolBean> toolBeanList=new ArrayList<>();
-        toolBeanList.add(new ToolBean(R.drawable.gxzt+"","高校直通"));
-        toolBeanList.add(new ToolBean(R.drawable.zycx+"","专业查询"));
-        toolBeanList.add(new ToolBean(R.drawable.cmyk+"","传媒艺考"));
-        toolBeanList.add(new ToolBean(R.drawable.phb+"","排行榜"));
-        for (int i = 0; i < toolBeanList.size(); i++) {
-            TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity());
-            textAndImgShowView.setTextColor(R.color.textColor);
-            textAndImgShowView.setText(toolBeanList.get(i).toolName);
-            textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImage));
-            textAndImgShowView.setSelect(true);
-            textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control);
-            textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0));
-            textAndImgShowView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-
-                }
-            });
-            layout_control.addView(textAndImgShowView);
-        }*/
-//        mIView.showTools(toolBeanList);
     }
 }
 package com.shunzhi.parent.presenter.consult;
-import android.content.res.TypedArray;
-import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -10,7 +7,6 @@ import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.share.mvpsdk.utils.OkHttpExceptionUtil;
-import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.ToolBean;
@@ -19,12 +15,9 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.bean.channel.ChannelInfo;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import com.shunzhi.parent.model.consult.ConsultModel;
-import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
 import com.shunzhi.parent.util.AttrsUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.List;
@@ -54,7 +47,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);
@@ -77,7 +70,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
                     }
                     mIView.showBanners(guangGaoBeanList);
                 } else {
-                    ToastUtils.showToast(jsonObject.get("message").getAsString());
+//                    ToastUtils.showToast(jsonObject.get("message").getAsString());
                 }
             }
         }, new Consumer<Throwable>() {
@@ -93,7 +86,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);
 package com.shunzhi.parent.presenter.consult.consultone;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.share.mvpsdk.utils.OkHttpExceptionUtil;
 import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.ToolBean;
+import com.shunzhi.parent.bean.channel.ChannelBean;
+import com.shunzhi.parent.bean.channel.ChannelContextBean;
+import com.shunzhi.parent.bean.channel.ChannelInfo;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
 import com.shunzhi.parent.model.consult.consultone.ConsultOneModel;
 import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;
@@ -20,6 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import io.reactivex.functions.Consumer;
+import retrofit2.HttpException;
 /**
  * Created by ToaHanDong on 2018/3/14.
@@ -46,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());
                 }
             });
         }
@@ -67,7 +73,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
                     }
                     mIView.showBanners(guangGaoBeanList);
                 }else {
-                    ToastUtils.showToast(jsonObject.get("message").getAsString());
+//                    ToastUtils.showToast(jsonObject.get("message").getAsString());
                 }
             }
         }, new Consumer<Throwable>() {
@@ -80,7 +86,48 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
     @Override
     public void getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex) {
+        mRxManager.register(mIModel.getConsultContent(areaName, channel, toFirstPage, pageIndex).subscribe(new Consumer<JsonObject>() {
+            @Override
+            public void accept(JsonObject jsonObject) throws Exception {
+                JsonObject json=jsonObject.getAsJsonObject("data");
+                Gson g=new Gson();
+                ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class);
+//                Log.e("ssss-===",channelInfo.toString());
+                List<ChannelContextBean> contextList = channelInfo.getChannelContent();
+                List<ChannelBean> channelList = channelInfo.getSubchannel();
+                mIView.showChannel(channelList);
+                mIView.showConsultContent(contextList);
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) throws Exception {
+                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+            }
+        }));
+
+
+    }
+    @Override
+    public void getInformationTopic(String keyword, String areaName, String channel, String toFirstPage,int pageIndex) {
+        mRxManager.register(mIModel.getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).subscribe(new Consumer<JsonObject>() {
+            @Override
+            public void accept(JsonObject jsonObject) throws Exception {
+                JsonObject json=jsonObject.getAsJsonObject("data");
+                Gson g=new Gson();
+                ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class);
+//                Log.e("ssss-===",channelInfo.toString());
+                List<ChannelContextBean> contextList = channelInfo.getChannelContent();
+                List<ChannelBean> channelList = channelInfo.getSubchannel();
+                mIView.showChannel(channelList);
+                mIView.showConsultContent(contextList);
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) throws Exception {
+                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+            }
+        }));
     }
@@ -13,16 +13,19 @@ import com.shunzhi.parent.bean.CurrentBean;
 import com.shunzhi.parent.bean.NIMLoginResultBean;
 import com.shunzhi.parent.bean.UserInfo;
 import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
-import com.shunzhi.parent.manager.MessageManager;
 import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
 import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;
 import com.shunzhi.parent.util.Utils;
+import org.json.JSONObject;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import io.reactivex.functions.Consumer;
+import okhttp3.ResponseBody;
 import retrofit2.HttpException;
+import retrofit2.Response;
 import timber.log.Timber;
 /**
@@ -36,7 +39,8 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
     @Override
     public void loginResult(final String loginName, final String loginPwd) {
         if (!isMate(loginName, REGEX_MOBILE)) {
-            ToastUtils.showToast("请输入正确的手机号！！");
+
+            mIView.showerror("请输入正确的手机号！！");
             return;
         }
@@ -46,7 +50,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.getLoginResult(loginName, loginPwd).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
-                Timber.i("---=== loginResult :%s", jsonObject);
                 try {
                     if (jsonObject != null && !TextUtils.isEmpty(jsonObject.get("access_token").getAsString())) {
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString());
@@ -65,9 +68,21 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                if (null != throwable)
-                    OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
-//                ToastUtils.showToast(throwable.getMessage());
+                Response response = ((HttpException) throwable).response();
+                if (response == null) return;
+                ResponseBody responseBody = response.errorBody();
+                if (responseBody == null) return;
+                try {
+                    JSONObject json = new JSONObject(responseBody.string());
+//                    ToastUtils.showToast(json.optString("message")+"json="+json);
+                    if (TextUtils.isEmpty(json.optString("error"))) {
+                        mIView.showerror(json.optString("message"));
+                        return;
+                    }
+                    mIView.showerror(json.optString("error"));
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
             }
         }));
@@ -89,7 +104,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 //TODO 注册成功返回
-                Log.e("1111", jsonObject.toString());
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
 //                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
                 mIView.getUserInfo(1);
@@ -97,8 +111,17 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                LoginAndRegistFragment.progressDialog.dismiss();
-                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+                Response response = ((HttpException) throwable).response();
+                if (response == null) return;
+                ResponseBody responseBody = response.errorBody();
+                if (responseBody == null) return;
+                try {
+                    JSONObject json = new JSONObject(responseBody.string());
+//                    ToastUtils.showToast(json.optString("message")+"json="+json);
+                    mIView.showerror(json.optString("message"));
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
             }
         }));
@@ -134,7 +157,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.getUserInfo(mobile, school_id, captcha).subscribe(new Consumer<UserInfo>() {
             @Override
             public void accept(UserInfo userInfo) throws Exception {
-                Log.d("6666", "userInfo=" + userInfo.toString());
                 if (userInfo != null) {
                     CurrentBean currentBean = userInfo.getData();
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, currentBean.getMobile());
@@ -143,9 +165,15 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(currentBean.getSex()));
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.PARENT_ID, String.valueOf(currentBean.getParentId()));
                     AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID, currentBean.getUserid());
+
+                    if (currentBean.getStudentClass() != null && currentBean.getStudentClass().size() > 0) {
+                        AppConfig.ISBINDING = true;
+                    }
+
                     String account = currentBean.getUserid();
                     String token = Utils.MD5(account);
                     nimLogin(account, token);
+
                     mIView.getUserInfo(0);
                 } else {
@@ -156,8 +184,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                LoginAndRegistFragment.progressDialog.dismiss();
-                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+                Response response = ((HttpException) throwable).response();
+                if (response == null) return;
+                ResponseBody responseBody = response.errorBody();
+                if (responseBody == null) return;
+                try {
+                    JSONObject json = new JSONObject(responseBody.string());
+//                    ToastUtils.showToast(json.optString("message")+"json="+json);
+                    mIView.showerror(json.optString("message"));
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+
+//                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
             }
         }));
     }
 package com.shunzhi.parent.presenter.mine;
+import android.util.Log;
+
 import com.google.gson.JsonObject;
 import com.share.mvpsdk.utils.OkHttpExceptionUtil;
 import com.share.mvpsdk.utils.ToastUtils;
@@ -47,14 +49,14 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                Response response = ((HttpException)throwable).response();
-                if (response==null)return;
+                Response response = ((HttpException) throwable).response();
+                if (response == null) return;
                 ResponseBody responseBody = response.errorBody();
-                if (responseBody==null)return;
+                if (responseBody == null) return;
                 try {
                     JSONObject json = new JSONObject(responseBody.string());
                     mIView.showError(json.optString("message"));
-                }  catch (Exception e1) {
+                } catch (Exception e1) {
                     e1.printStackTrace();
                 }
@@ -64,12 +66,18 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
     }
     @Override
-    public void addChild( int sex , String studentName,int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
-        mRxManager.register(mIModel.addChildResult(sex,studentName,parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
+    public void addChild(int sex, String studentName, int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
+        mRxManager.register(mIModel.addChildResult(sex, studentName, parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 ToastUtils.showToast("绑定孩子成功");
-                mIView.addChildSuccess();
+                if (jsonObject.get("data").toString().equals("null")) {
+                    mIView.addChildSuccess("", "");
+                } else {
+                    JsonObject data = jsonObject.getAsJsonObject("data");
+                    mIView.addChildSuccess(data.get("account").getAsString(), data.get("password").getAsString());
+                }
+
             }
         }, new Consumer<Throwable>() {
             @Override
@@ -34,7 +34,7 @@ public class PersonInfoPrasenter extends PersonInfoContract.PersonInfoPresenter 
             public void accept(JsonObject jsonObject) throws Exception {
                 try {
                     if(jsonObject!=null&&jsonObject.get("data").getAsBoolean()) {
-                        ToastUtils.showToast(jsonObject.toString());
+//                        ToastUtils.showToast(jsonObject.toString());
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, parentName);
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(sex));
                         mIView.updateInfo();
@@ -3,6 +3,7 @@ package com.shunzhi.parent.ui.activity;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.google.gson.Gson;
@@ -15,7 +16,8 @@ import com.shunzhi.parent.bean.ChildBean;
  */
 public class ChildDetialActivity extends BaseCompatActivity {
-    TextView child_name, child_school, child_class, school_area, student_code,center_title,back;
+    TextView child_name, child_school, child_class, school_area, student_code,center_title;
+    ImageView back;
     @Override
     protected void initView(Bundle savedInstanceState) {
 package com.shunzhi.parent.ui.activity;
 import android.os.Bundle;
+import android.util.Log;
 import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.shunzhi.parent.R;
@@ -18,6 +19,7 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
     protected void initView(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             type = getIntent().getStringExtra("type");
+            Log.e("aaa--==",type);
             mFragments[0] = LoginAndRegistFragment.getInstance(type);
             loadRootFragment(R.id.frame, mFragments[0]);
         } else {
@@ -26,6 +28,15 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
     }
     @Override
+    protected void onResume() {
+        super.onResume();
+//        type = getIntent().getStringExtra("type");
+//        Log.e("aaa--==",type);
+//        mFragments[0] = LoginAndRegistFragment.getInstance(type);
+//        loadRootFragment(R.id.frame, mFragments[0]);
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.activity_regist;
     }
@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -26,6 +27,7 @@ import com.shunzhi.parent.bean.CurrentBean;
 import com.shunzhi.parent.contract.mine.MyChildContract;
 import com.shunzhi.parent.presenter.mine.MyChildPresenter;
 import com.shunzhi.parent.ui.activity.binding.SelectSchoolActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.yanzhenjie.recyclerview.swipe.SwipeMenu;
 import com.yanzhenjie.recyclerview.swipe.SwipeMenuBridge;
 import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
@@ -43,7 +45,8 @@ import java.util.List;
 public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel>
         implements MyChildContract.IMyChildView, View.OnClickListener {
     SwipeMenuRecyclerView child_recycle;
-    TextView back, center_title, add_child;
+    TextView  center_title, add_child, go_buy;
+    ImageView back;
     ChildAdapter childAdapter;
     List<ChildBean> currlist = new ArrayList<>();
@@ -59,6 +62,7 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
         add_child = findViewById(R.id.add_child);
         child_recycle = findViewById(R.id.child_recycle);
         back = findViewById(R.id.back_top);
+
         center_title = findViewById(R.id.center_title);
         center_title.setText("我的孩子");
         add_child.setOnClickListener(this);
@@ -119,6 +123,12 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
             finish();
         } else if (v == add_child) {
             startActivity(new Intent().setClass(MyChildActivity.this, SelectSchoolActivity.class));
+        } else if (v == go_buy) {
+            Bundle bundle = new Bundle();
+            bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
+                    AppConfig.getAppConfig(this).get(AppConfig.USER_ID));
+            bundle.putInt("type",AppConfig.ORDER_CENTER);
+            startNewActivity(WebViewActivity.class, bundle);
         }
     }
@@ -136,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
     }
     @Override
-    public void addChildSuccess() {
+    public void addChildSuccess(String account,String  password) {
     }
@@ -18,6 +18,7 @@ import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.contract.mine.PersonInfoContract;
 import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter;
+import com.shunzhi.parent.util.GlideUtils;
 /**
  * Created by Administrator on 2018/3/10 0010.
@@ -56,9 +57,11 @@ public class PersonInfoActivity extends BaseMVPCompatActivity&lt;PersonInfoContract
     private void initInfo() {
         String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
         if (!TextUtils.isEmpty(url)) {
-            Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image);
+            GlideUtils.showImg(this,user_image,url);
+//            Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image);
         } else {
-            Glide.with(this).load(R.drawable.test).centerCrop().into(user_image);
+//            Glide.with(this).load(R.drawable.test).centerCrop().into(user_image);
+            GlideUtils.showImg(this,user_image,url);
         }
         user_image.setCornerRadius(20);
         user_image.setOval(true);
@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -38,8 +39,9 @@ public class CheckInfoActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyC
     int school_id = 0, isNew, classId, studentId;
     String captcha = "";
     LinearLayout iphone_layout;
-    TextView child_name, child_sex, child_grade, child_class, add_child, user_mobile, back, center_title;
+    TextView child_name, child_sex, child_grade, child_class, add_child, user_mobile, center_title;
     ChildBean childBean;
+    ImageView back;
     @NonNull
     @Override
@@ -99,6 +101,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyC
             right_btn.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    popupWindow.dismiss();
                     startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CheckInfoActivity.this, MyChildActivity.class));
                     finish();
                 }
@@ -149,10 +152,10 @@ public class CheckInfoActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyC
     }
     @Override
-    public void addChildSuccess() {
+    public void addChildSuccess(String account,String  password) {
 //        WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
         WebViewActivity.getInstance(CheckInfoActivity.this,
-                AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+
+                AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
                         AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
         finish();
@@ -9,6 +9,7 @@ import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.share.mvpsdk.base.BasePresenter;
@@ -35,8 +36,9 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity&lt;MyChildContra
         implements MyChildContract.IMyChildView, View.OnClickListener {
     int type, school_id, sexId, gradeId, classId;
-    TextView select_sex, select_grade, select_class, add_child, center_title, back;
+    TextView select_sex, select_grade, select_class, add_child, center_title;
     EditText child_name;
+    ImageView back;
     Map<String, Integer> currMap = new ArrayMap<>();
     List<ChildClass> gradeList = new ArrayList<>();
     List<ChildClass> classList = new ArrayList<>();
@@ -130,8 +132,9 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity&lt;MyChildContra
     }
     @Override
-    public void addChildSuccess() {
-        WebViewActivity.getInstance(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT);
+    public void addChildSuccess(String account,String password) {
+        WebViewActivity.startShow(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
+                AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT,account,password,child_name.getText().toString());
         finish();
     }
@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.share.mvpsdk.base.BasePresenter;
@@ -19,9 +20,10 @@ import com.shunzhi.parent.presenter.mine.MyChildPresenter;
  */
 public class InviteCodeActivity extends BaseMVPCompatActivity {
-    TextView add_child,center_title,back;
+    TextView add_child,center_title;
     EditText et_invite_code;
     int school_id;
+    ImageView back;
     @NonNull
     @Override
@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.share.mvpsdk.base.BasePresenter;
@@ -39,7 +40,8 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity&lt;SchoolListContra
         View.OnClickListener, SchoolListContract.ISchoolListView, CityPickerListener {
     private SideBar sideBar;
-    private TextView dialog, go_next, tvLocalAddress, center_title, back;
+    private TextView dialog, go_next, tvLocalAddress, center_title;
+    ImageView back;
     private RecyclerView schoollist;
     private List<String> list = new ArrayList<>();
     SchoolListAdapter schoolListAdapter;
@@ -69,7 +71,7 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity&lt;SchoolListContra
         go_next.setOnClickListener(this);
         tvLocalAddress = findViewById(R.id.tvLocalAddress);
         tvLocalAddress.setOnClickListener(this);
-        tvLocalAddress.setText(AppContext.getInstance().cityName);
+        tvLocalAddress.setText(AppContext.getInstance().district);
         setSchoolList();
@@ -2,27 +2,38 @@ package com.shunzhi.parent.ui.activity.consult;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v4.app.FragmentTransaction;
 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 class ConsultOneLevelActivity extends BaseCompatActivity implements View.OnClickListener {
-
-    public static void getInstance(Context context){
-        Intent intent=new Intent(context,ConsultOneLevelActivity.class);
+    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;
+    ImageView ivSearch, ivBack;
+
+    String channel = "";
+
+    FrameLayout frame_consult;
+
+    FragmentTransaction fragmentTransaction = null;
+
+    ConsultOneLevelFragment consultOneLevelFragment = null;
+
     @Override
     protected void initView(Bundle savedInstanceState) {
@@ -32,12 +43,22 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
     private void initViews() {
-        et_search=findViewById(R.id.et_search);
-        ivSearch=findViewById(R.id.ivSearch);
-        ivBack=findViewById(R.id.ivBack);
+        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);
+        fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.frame_consult, consultOneLevelFragment)
+                .show(consultOneLevelFragment).commit();
     }
     @Override
@@ -47,9 +68,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
     @Override
     public void onClick(View view) {
-        switch (view.getId()){
+        switch (view.getId()) {
             case R.id.ivSearch:
-
+                consultOneLevelFragment.showSearchContent(et_search.getText().toString());
                 break;
             case R.id.ivBack:
                 finish();
@@ -2,27 +2,26 @@ 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 {
-    public static void getInstance(Context context){
+    public static void getInstance(Context context,String channel,String titleName){
         Intent intent=new Intent(context,ConsultTwoLevelActivity.class);
+        intent.putExtra("channel",channel);
+        intent.putExtra("titleName",titleName);
         context.startActivity(intent);
     }
@@ -30,6 +29,13 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
     EditText et_search;
+    String channel,titleName;
+
+    FrameLayout frame_consult;
+
+    ConsultTwoLevelFragment consultTwoLevelFragment;
+
+    FragmentTransaction fragmentTransaction=null;
     @Override
     protected void initView(Bundle savedInstanceState) {
@@ -43,14 +49,28 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
     private void initViews() {
-
+        channel=getIntent().getStringExtra("channel");
+        titleName=getIntent().getStringExtra("titleName");
         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);
+        bundle.putString("titleName",titleName);
+        consultTwoLevelFragment.setArguments(bundle);
+        fragmentTransaction=getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.frame_consult,consultTwoLevelFragment)
+                .show(consultTwoLevelFragment).commit();
     }
@@ -3,9 +3,7 @@ package com.shunzhi.parent.ui.activity.mywebview;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
@@ -13,6 +11,7 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -20,15 +19,19 @@ import android.widget.TextView;
 import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.share.mvpsdk.utils.AppUtils;
 import com.share.mvpsdk.utils.NetworkConnectionUtils;
+import com.share.mvpsdk.utils.ToastUtils;
 import com.share.mvpsdk.widgets.NestedScrollWebView;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.ui.MainActivity;
 public class WebViewActivity extends BaseCompatActivity {
     NestedScrollWebView nesteScrollWebView;
     LinearLayout binding_success, binding_success2;
-    TextView close,tv_info,zuoye,title_web;
+    ImageView close_btn;
+    TextView tv_info, zuoye, title_web;
+
     int type;
     private ProgressBar pvWeb;
@@ -37,19 +40,47 @@ public class WebViewActivity extends BaseCompatActivity {
         Intent intent = new Intent(context, WebViewActivity.class);
         intent.putExtra("url", url);
         intent.putExtra("type", type);
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        context.startActivity(intent);
+    }
+
+    public static void startShow(Context context, String url, int type, String account, String password, String name) {
+        Intent intent = new Intent(context, WebViewActivity.class);
+        intent.putExtra("url", url);
+        intent.putExtra("type", type);
+        intent.putExtra("account", account);
+        intent.putExtra("password", password);
+        intent.putExtra("name", name);
         context.startActivity(intent);
     }
+
     @Override
     protected void initView(Bundle savedInstanceState) {
-        binding_success=findViewById(R.id.binding_success1);
-        binding_success2=findViewById(R.id.binding_success2);
-        close = findViewById(R.id.close_btn);
+
+//        binding_success = findViewById(R.id.binding_success);
+
+        binding_success = findViewById(R.id.binding_success1);
+
+        binding_success2 = findViewById(R.id.binding_success2);
+        close_btn = findViewById(R.id.close_btn);
         tv_info = findViewById(R.id.tv_info);
         zuoye = findViewById(R.id.zuoye);
         title_web = findViewById(R.id.title_web);
-        nesteScrollWebView = findViewById(R.id.webView);
+
+        close_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressedSupport();
+            }
+        });
+
+
+        nesteScrollWebView = findViewById(R.id.nesteScrollWebView);
+
+//        nesteScrollWebView = findViewById(R.id.webView);
+
         pvWeb = findViewById(R.id.pb_web);
         type = getIntent().getIntExtra("type", 0);
         if (type == AppConfig.BINDING_SUCCESS_HEZUO) {
@@ -61,15 +92,25 @@ public class WebViewActivity extends BaseCompatActivity {
             binding_success.setVisibility(View.GONE);
             binding_success2.setVisibility(View.VISIBLE);
             title_web.setVisibility(View.GONE);
+            String account = getIntent().getStringExtra("account");
+            String name = getIntent().getStringExtra("name");
+            String password = getIntent().getStringExtra("password");
+
+            tv_info.setText("生成孩子“" + name + "”账号为:" + account + "，初始密码为：" + password + "（与账号相同）。孩子可以下载“汇作业”app进行使用");
         } else if (type == AppConfig.ORDER_CENTER) {
             binding_success.setVisibility(View.GONE);
             binding_success2.setVisibility(View.GONE);
             title_web.setVisibility(View.VISIBLE);
-        }else {
+
+        } else {
             binding_success.setVisibility(View.GONE);
             binding_success2.setVisibility(View.GONE);
             title_web.setVisibility(View.GONE);
+            LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) nesteScrollWebView.getLayoutParams();
+            lp.setMargins(0, 0, 0, 0);
+            nesteScrollWebView.setLayoutParams(lp);
+
         }
         initWebView();
@@ -79,7 +120,7 @@ public class WebViewActivity extends BaseCompatActivity {
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_webview;
+        return R.layout.activity_web_view;
     }
     @Override
@@ -88,6 +129,9 @@ public class WebViewActivity extends BaseCompatActivity {
             nesteScrollWebView.goBack();
         } else {
             super.onBackPressedSupport();
+            if(type!=-1&&type!= AppConfig.ORDER_CENTER) {
+                startActivity(new Intent().setClass(this, MainActivity.class));
+            }
         }
     }
@@ -111,6 +155,7 @@ public class WebViewActivity extends BaseCompatActivity {
             });
         }
     }
+
     // 调起支付宝并跳转到指定页面
     private void startAlipayActivity(String url) {
         Intent intent;
@@ -133,7 +178,8 @@ public class WebViewActivity extends BaseCompatActivity {
         nesteScrollWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (url.startsWith("http"))view.loadUrl(url);
+                Log.d("666666", "url=" + url);
+                if (url.startsWith("http")) view.loadUrl(url);
 //                if (url.contains("platformapi/startapp")) {
 //                    startAlipayActivity(url);
 //                     android  6.0 两种方式获取intent都可以跳转支付宝成功,7.1测试不成功
@@ -154,11 +200,20 @@ public class WebViewActivity extends BaseCompatActivity {
                 // html加载完成之后，添加监听图片的点击js函数
                 addWebImageClickListner(view);
 //                toolbar.setTitle(getToolbarTitle());
+                if (nesteScrollWebView.canGoBack()) {
+                    binding_success.setVisibility(View.GONE);
+                    binding_success2.setVisibility(View.GONE);
+                    title_web.setVisibility(View.GONE);
+                } else {
+
+                }
             }
             @Override
             public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                view.getSettings().setJavaScriptEnabled(true);
+//                Log.d("666666","onPageStartedurl="+url);
+//                if (url.startsWith("http"))view.loadUrl(url);
+//                view.getSettings().setJavaScriptEnabled(true);
                 super.onPageStarted(view, url, favicon);
             }
@@ -190,7 +245,6 @@ public class WebViewActivity extends BaseCompatActivity {
                 }
             }
         });
-
         nesteScrollWebView.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
@@ -209,6 +263,8 @@ public class WebViewActivity extends BaseCompatActivity {
     }
+
+
     /**
      * 初始化WebSetting
      *
@@ -17,13 +17,16 @@ import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
+import com.share.mvpsdk.base.adapter.OnItemClickListener;
 import com.share.mvpsdk.utils.DateUtils;
 import com.share.mvpsdk.utils.DisplayUtils;
+import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.orderdetail.OrderDetailBean;
 import com.shunzhi.parent.bean.orderdetail.OrderDetailBeanList;
 import com.shunzhi.parent.contract.orderdetail.OrderDetailContract;
 import com.shunzhi.parent.presenter.orederdetail.OrderDetailPresenter;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import java.util.List;
@@ -119,6 +122,14 @@ public class OrderDetailActivity extends BaseMVPCompatActivity&lt;OrderDetailContra
                 tvDate.setText(object.date);
                 myOrderBeanListAdapter.addAll(object.orderList);
+                myOrderBeanListAdapter.setOnItemClickListener(new OnItemClickListener() {
+                    @Override
+                    public void onItemClickListener(Object object, int position) {
+                        OrderDetailBeanList orderDetailBeanList= (OrderDetailBeanList) object;
+                        WebViewActivity.getInstance(OrderDetailActivity.this,
+                                AppConfig.BASE_URL_ORDER+"OrderDetail.aspx?orderid="+orderDetailBeanList.id,-1);
+                    }
+                });
             }
@@ -145,30 +156,47 @@ public class OrderDetailActivity extends BaseMVPCompatActivity&lt;OrderDetailContra
                     private TextView tvStartTIme_EndTime,tvProductName,tvPayState;
+                    private ImageView ivState;
+
                     public MyOrderBeanListViewHolder(View itemView) {
                         super(itemView);
                         layout_order_list=itemView.findViewById(R.id.layout_order_list);
                         tvStartTIme_EndTime=itemView.findViewById(R.id.tvStartTIme_EndTime);
                         tvProductName=itemView.findViewById(R.id.tvProductName);
                         tvPayState=itemView.findViewById(R.id.tvPayState);
+                        ivState=itemView.findViewById(R.id.ivState);
                     }
                     @Override
-                    public void onBindViewHolder(OrderDetailBeanList object, int position) {
+                    public void onBindViewHolder(final OrderDetailBeanList object, final int position) {
                         tvStartTIme_EndTime.setText(object.saleStartTime.split(" ")[0]+"-"+
                                 object.saleEndTime.split(" ")[0]);
                         tvProductName.setText(object.productName);
                         switch (object.payState){
                             case 0://待支付
                                 tvPayState.setText("待支付");
+                                ivState.setBackgroundColor(getResources().getColor(R.color.md_red_500));
                                 break;
                             case 1://支付成功
                                 tvPayState.setText("支付成功");
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.success));
                                 break;
                             case 2://交易关闭
                                 tvPayState.setText("交易关闭");
+                                ivState.setBackgroundColor(getResources().getColor(R.color.gray));
+                                break;
+                            case 3:
+                                tvPayState.setText("支付失败");
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.close));
                                 break;
                         }
+
+                        layout_order_list.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                onItemClickListener.onItemClickListener(object,position);
+                            }
+                        });
                     }
                 }
             }
@@ -9,41 +9,44 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.bumptech.glide.Glide;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.bean.ToolBean;
 import com.shunzhi.parent.contract.ceping.CepingContract;
 import com.shunzhi.parent.presenter.ceping.CePingPresenter;
 import com.shunzhi.parent.ui.activity.MyChildActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
+import com.shunzhi.parent.util.GlideUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
+import java.util.List;
+
 import me.leefeng.citypicker.CityPicker;
 import me.leefeng.citypicker.CityPickerListener;
-public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingPresenter,CepingContract.ICePingModel> implements CepingContract.ICePingView
-        ,View.OnClickListener,CityPickerListener{
-
-    TextView tvLocalAddress;
+public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingPresenter, CepingContract.ICePingModel> implements CepingContract.ICePingView
+        , View.OnClickListener, CityPickerListener {
-    ImageView ivCamera;
+    TextView tvLocalAddress, tvCourse1, tvCourse2, tvCourse3;
-    TextAndImgShowView textAndImg_xqjc,textAndImg_zxlx;
+    ImageView ivCamera, ivCourse1, ivCourse2, ivCourse3;
-    FrameLayout frame_hot1;
+    TextAndImgShowView textAndImg_xqjc, textAndImg_zxlx;
     FloatingActionButton floatingActionButton;
     LinearLayout layout_control;
-    CityPicker cityPicker=null;
+    CityPicker cityPicker = null;
     @Override
     public int getLayoutId() {
@@ -53,25 +56,29 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
-        ivCamera=view.findViewById(R.id.ivCamera);
-        tvLocalAddress=view.findViewById(R.id.tvLocalAddress);
-        textAndImg_xqjc=view.findViewById(R.id.textAndImg_xqjc);
-        textAndImg_zxlx=view.findViewById(R.id.textAndImg_zxlx);
-        frame_hot1=view.findViewById(R.id.frame_hot1);
-        layout_control=view.findViewById(R.id.layout_control);
-        floatingActionButton=view.findViewById(R.id.floatingActionButton);
+        ivCamera = view.findViewById(R.id.ivCamera);
+        tvLocalAddress = view.findViewById(R.id.tvLocalAddress);
+        textAndImg_xqjc = view.findViewById(R.id.textAndImg_xqjc);
+        textAndImg_zxlx = view.findViewById(R.id.textAndImg_zxlx);
+        layout_control = view.findViewById(R.id.layout_control);
+        floatingActionButton = view.findViewById(R.id.floatingActionButton);
+        tvCourse1 = view.findViewById(R.id.tvCourse1);
+        tvCourse2 = view.findViewById(R.id.tvCourse2);
+        tvCourse3 = view.findViewById(R.id.tvCourse3);
+        ivCourse1 = view.findViewById(R.id.ivCourse1);
+        ivCourse2 = view.findViewById(R.id.ivCourse2);
+        ivCourse3 = view.findViewById(R.id.ivCourse3);
         addTools();
-        tvLocalAddress.setText(AppContext.getInstance().cityName);
         textAndImg_xqjc.setTextColor(R.color.white);
         textAndImg_xqjc.setText("学情检测");
-        textAndImg_xqjc.setImgs(R.drawable.xqjc,R.drawable.xqjc);
+        textAndImg_xqjc.setImgs(R.drawable.xqjc, R.drawable.xqjc);
         textAndImg_xqjc.setSelect(true);
         textAndImg_zxlx.setText("专项训练");
         textAndImg_zxlx.setTextColor(R.color.white);
-        textAndImg_zxlx.setImgs(R.drawable.zxlx,R.drawable.zxlx);
+        textAndImg_zxlx.setImgs(R.drawable.zxlx, R.drawable.zxlx);
         textAndImg_zxlx.setSelect(true);
         initListeners(view);
@@ -81,23 +88,21 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
                 startActivity(new Intent().setClass(getActivity(), MyChildActivity.class));
             }
         });
-//        floatingActionButton.setOnClickListeners(new DragFloatActionButton.OnClickListeners() {
-//            @Override
-//            public void onClicks() {
-//                ToastUtils.showToast("dfafdaf");
-//            }
-//        });
     }
     private void addTools() {
-        layout_control.measure(0,0);
-        mPresenter.getTools(layout_control,AppContext.getInstance().district);
+        layout_control.measure(0, 0);
+        mPresenter.getTools(layout_control, AppContext.getInstance().district);
     }
     @Override
     public void onResume() {
         super.onResume();
+//        if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){
+            tvLocalAddress.setText(AppContext.getInstance().district);
+            addTools();
+//        }
     }
     private void initListeners(View view) {
@@ -112,9 +117,9 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     private void initBroadCast() {
-        IntentFilter intentFilter=new IntentFilter();
-        intentFilter.addAction(AppContext.LOCATION_CITYNAME+"");
-        getActivity().registerReceiver(broadcastReceiver,intentFilter);
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(AppContext.LOCATION_CITYNAME + "");
+        getActivity().registerReceiver(broadcastReceiver, intentFilter);
     }
@@ -124,23 +129,25 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
         return new CePingPresenter();
     }
-
     @Override
     public void onClick(View view) {
-        switch (view.getId()){
+        switch (view.getId()) {
             case R.id.frame_hot1://热门课程
-                ToastUtils.showToast("remen1");
+                if (tvCourse1.getTag()!=null)
+                WebViewActivity.getInstance(getActivity(),tvCourse1.getTag().toString(),-1);
                 break;
             case R.id.frame_hot2:
-                ToastUtils.showToast("remen2");
+                if (tvCourse2.getTag()!=null)
+                WebViewActivity.getInstance(getActivity(),tvCourse2.getTag().toString(),-1);
                 break;
             case R.id.frame_hot3:
-                ToastUtils.showToast("remen3");
+                if (tvCourse3.getTag()!=null)
+                WebViewActivity.getInstance(getActivity(),tvCourse3.getTag().toString(),-1);
                 break;
             case R.id.tvLocalAddress:
 //                AppContext.getInstance().startLocation();
-                if (null==cityPicker)cityPicker=new CityPicker(getActivity(),this);
-                if (cityPicker.isShow())cityPicker.close();
+                if (null == cityPicker) cityPicker = new CityPicker(getActivity(), this);
+                if (cityPicker.isShow()) cityPicker.close();
                 else cityPicker.show();
                 break;
             case R.id.ivCamera:
@@ -149,10 +156,10 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
         }
     }
-    private BroadcastReceiver broadcastReceiver=new BroadcastReceiver() {
+    private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(AppContext.LOCATION_CITYNAME+"")){
+            if (intent.getAction().equals(AppContext.LOCATION_CITYNAME + "")) {
                 tvLocalAddress.setText(AppContext.getInstance().cityName);
             }
         }
@@ -161,19 +168,36 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (null!=broadcastReceiver)getActivity().unregisterReceiver(broadcastReceiver);
-        if (null!=cityPicker)cityPicker.cancle();
+        if (null != broadcastReceiver) getActivity().unregisterReceiver(broadcastReceiver);
+        if (null != cityPicker) cityPicker.cancle();
     }
     @Override
     public void getCity(String name) {
-        tvLocalAddress.setText(name.split(" ")[1]);
-        mPresenter.getTools(layout_control,name.split(" ")[2]);
-        ToastUtils.showToast(name.split(" ")[2]);
+        tvLocalAddress.setText(name.split(" ")[2]);
+        mPresenter.getTools(layout_control, name.split(" ")[2]);
+        AppContext.getInstance().cityName=name.split(" ")[1];
+        AppContext.getInstance().district=name.split(" ")[2];
     }
     @Override
-    public void showTools() {
+    public void showTools(List<ToolBean> toolBeanList) {
+        if (toolBeanList.size() > 0) {
+            tvCourse1.setText(toolBeanList.get(0).toolName);
+            GlideUtils.showImg(getActivity(),ivCourse1,toolBeanList.get(0).toolImage);
+            tvCourse1.setTag(toolBeanList.get(0).toolUrl);
+        }
+        if (toolBeanList.size() > 1) {
+            tvCourse2.setText(toolBeanList.get(1).toolName);
+            GlideUtils.showImg(getActivity(),ivCourse2,toolBeanList.get(1).toolImage);
+            tvCourse2.setTag(toolBeanList.get(1).toolUrl);
+        }
+
+        if (toolBeanList.size() > 2) {
+            tvCourse3.setText(toolBeanList.get(2).toolName);
+            GlideUtils.showImg(getActivity(),ivCourse3,toolBeanList.get(2).toolImage);
+            tvCourse3.setTag(toolBeanList.get(2).toolUrl);
+        }
     }
 }
@@ -8,26 +8,28 @@ 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.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;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
-import com.shunzhi.parent.adapter.ContextAdapter;
+import com.shunzhi.parent.adapter.MyConsultAdapter;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.channel.ChannelBean;
 import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import com.shunzhi.parent.presenter.consult.ConsultPresenter;
 import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.util.AttrsUtils;
+import com.shunzhi.parent.util.GlideUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
 import com.stx.xhb.xbanner.XBanner;
@@ -45,9 +47,9 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     XBanner xBanner;
-    RecyclerView recycler_context;
+    XRecyclerView recycler_context;
-    ContextAdapter contextAdapter;
+    MyConsultAdapter contextAdapter;
     List<String> imgesUrl = new ArrayList<>();
     List<String> describeList = new ArrayList<>();
@@ -61,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;
@@ -69,7 +74,6 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
-
         recycler_context = view.findViewById(R.id.recycler_content);
         initRecycler();
@@ -78,15 +82,12 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         videoplayer = view.findViewById(R.id.videoplayer);
         tvLocalAddress = view.findViewById(R.id.tvLocalAddress);
         layout_control = view.findViewById(R.id.layout_control);
-
-        tvLocalAddress.setText(AppContext.getInstance().cityName);
+        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", "余杭区");
-        mPresenter.getContextChannel("余杭区", 0, 1, 1);
+        mPresenter.getBanners("2", AppContext.getInstance().district);
         initBroadCast();
@@ -95,8 +96,26 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     private void initRecycler() {
         recycler_context.setLayoutManager(new LinearLayoutManager(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() {
@@ -109,8 +128,14 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         xBanner.setmAdapter(new XBanner.XBannerAdapter() {
             @Override
             public void loadBanner(XBanner banner, Object model, View view, int position) {
-                Glide.with(getActivity()).load(imgesUrl.get(position)).placeholder(R.drawable.ic_launcher_background)
-                        .into((ImageView) view);
+                GlideUtils.showImg(getActivity(),(ImageView) view,imgesUrl.get(position));
+            }
+        });
+
+        xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() {
+            @Override
+            public void onItemClick(XBanner banner, int position) {
+                WebViewActivity.getInstance(getContext(), describeList.get(position), -1);
             }
         });
@@ -149,7 +174,6 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         }
     }
-
     private void initBroadCast() {
         IntentFilter intentFilter = new IntentFilter();
@@ -162,7 +186,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);
             }
         }
     };
@@ -181,50 +205,63 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     @Override
     public void showBanners(List<GuangGaoBean> guangGaoBeanList) {
+        describeList.clear();
+        imgesUrl.clear();
         for (int i = 0; i < guangGaoBeanList.size(); i++) {
-            imgesUrl.add(AppConfig.BASE_URL_IMG + guangGaoBeanList.get(i).fileSrc);
+            imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc);
             describeList.add(guangGaoBeanList.get(i).describe);
         }
         initBanners();
     }
     @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());
-//            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.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    ConsultOneLevelActivity.getInstance(getActivity());
-                }
-            });
-            layout_control.addView(textAndImgShowView);
+    public void showChannel(final List<ChannelBean> list) {
+        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.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();
         contextList.addAll(list);
-        contextAdapter.addAll(contextList);
-        recycler_context.setAdapter(contextAdapter);
-
-
+        if (contextAdapter == null) {
+            contextAdapter = new MyConsultAdapter(getActivity());
+            contextAdapter.addAll(contextList);
+            recycler_context.setAdapter(contextAdapter);
+        } else {
+            contextAdapter.addAll(contextList);
+            contextAdapter.notifyDataSetChanged();
+        }
     }
     @Override
     public void getCity(String name) {
-        tvLocalAddress.setText(name.split(" ")[1]);
+        first=true;
+        tvLocalAddress.setText(name.split(" ")[2]);
+        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];
     }
 }
 package com.shunzhi.parent.ui.fragment;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -9,11 +11,10 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.bumptech.glide.Glide;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
-import com.share.mvpsdk.utils.ToastUtils;
+import com.share.mvpsdk.utils.CacheUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
@@ -25,12 +26,13 @@ import com.shunzhi.parent.ui.activity.MyChildActivity;
 import com.shunzhi.parent.ui.activity.PersonInfoActivity;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
+import com.shunzhi.parent.util.GlideUtils;
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order;
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about,layoutAdvice;
     RoundedImageView user_photo;
-    TextView user_name, user_mobile;
+    TextView user_name, user_mobile, tvExit, binding_state;
     @NonNull
     @Override
@@ -49,6 +51,12 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
         personinfo = view.findViewById(R.id.personinfo);
         layout_order = view.findViewById(R.id.layout_order);
         layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
+        layout_cache = view.findViewById(R.id.layout_cache);
+        layout_about = view.findViewById(R.id.layout_about);
+        layoutAdvice=view.findViewById(R.id.layoutAdvice);
+        layoutAdvice.setOnClickListener(this);
+        layout_about.setOnClickListener(this);
+        layout_cache.setOnClickListener(this);
         childlayout.setOnClickListener(this);
         personinfo.setOnClickListener(this);
         layout_order.setOnClickListener(this);
@@ -56,17 +64,22 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
         user_photo = view.findViewById(R.id.user_photo);
         user_name = view.findViewById(R.id.user_name);
         user_mobile = view.findViewById(R.id.user_mobile);
+        tvExit = view.findViewById(R.id.tvExit);
+        tvExit.setOnClickListener(this);
+        binding_state = view.findViewById(R.id.binding_state);
+        if (AppConfig.ISBINDING) {
+            binding_state.setText("");
+        }
     }
-    private void  setPersonInfo() {
+    private void setPersonInfo() {
         if (AppConfig.ISLOGIN) {
             String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
-            ToastUtils.showToast(url);
             if (!TextUtils.isEmpty(url)) {
-                Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
+                GlideUtils.showImg(getContext(),user_photo,url);
             } else {
-                Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);
+                GlideUtils.showImg(getContext(),user_photo,url);
                 user_photo.setCornerRadius(20);
             }
             user_photo.setCornerRadius(20);
@@ -74,6 +87,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
             user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
             user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
             user_mobile.setVisibility(View.VISIBLE);
+        }else {
+            user_name.setVisibility(View.VISIBLE);
+            user_mobile.setVisibility(View.GONE);
         }
     }
@@ -97,14 +113,66 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
                 Bundle bundle = new Bundle();
                 bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
                         AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
-                bundle.putInt("type",AppConfig.ORDER_CENTER);
+                bundle.putInt("type", AppConfig.ORDER_CENTER);
                 startNewActivity(WebViewActivity.class, bundle);
                 break;
+            case R.id.tvExit:
+                clearUerinfo();
+                break;
+            case R.id.layout_cache:
+                clearMyCache();
+                break;
+            case R.id.layout_about:
+                WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"About.html",-1);
+                break;
+            case R.id.layoutAdvice:
+                WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"FeedBack.aspx?userid="+AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID),-1);
+                break;
             default:
                 break;
         }
     }
+    private void clearMyCache() {
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        try {
+            builder.setMessage("清理缓存" + CacheUtils.getCacheSize(getActivity()) + "")
+                    .setPositiveButton("取消", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            dialogInterface.dismiss();
+                        }
+                    })
+                    .setNegativeButton("确定", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            try {
+                                CacheUtils.clearCache(getActivity());
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            dialogInterface.dismiss();
+                        }
+                    });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        builder.create().show();
+    }
+
+    private void clearUerinfo() {
+        if(AppConfig.ISLOGIN) {
+            AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, "");
+            AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, "");
+            AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, "");
+            AppConfig.ISLOGIN = false;
+            setPersonInfo();
+            startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
+            getActivity().finish();
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -36,7 +36,7 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;ReportContract.ReportP
     MaterialCalendarView calendarView_month_mode;
-    TextView tvDate,tvShaiXuan;
+    TextView tvDate,tvShaiXuan,tvNoData;
     ShaiXuanPop shaiXuanPop=null;
@@ -57,6 +57,7 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;ReportContract.ReportP
         calendarView_month_mode = view.findViewById(R.id.calendarView_month_mode);
         tvDate = view.findViewById(R.id.tvDate);
         tvShaiXuan=view.findViewById(R.id.tvShaiXuan);
+        tvNoData=view.findViewById(R.id.tvNoData);
         LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
         layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
@@ -117,6 +118,7 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;ReportContract.ReportP
     @Override
     public void showReports(List<String> stringList) {
         if (null!=shaiXuanPop){
+            if (stringList.size()>0)tvNoData.setVisibility(View.GONE);
             shaiXuanPop.setDatas(stringList);
             shaiXuanPop.show(tvShaiXuan);
         }
@@ -5,13 +5,16 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.channel.ChannelBean;
@@ -19,6 +22,7 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import com.shunzhi.parent.presenter.consult.ConsultPresenter;
 import com.shunzhi.parent.ui.MainActivity;
+import com.shunzhi.parent.util.GlideUtils;
 import com.stx.xhb.xbanner.XBanner;
 import java.util.ArrayList;
@@ -29,6 +33,8 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     XBanner xBanner;
+    TextView tvJump;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_start;
@@ -36,11 +42,24 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
+
         xBanner = view.findViewById(R.id.xBanner);
+        tvJump=view.findViewById(R.id.tvJump);
+
         if (!TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.APP_IS_START))) {
-            mPresenter.getBanners("0","杭州");
+            mPresenter.getBanners("0", "余杭区");
             AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");
-        } else mPresenter.getBanners("1","杭州");
+        } else mPresenter.getBanners("1","余杭区");
+
+
+        tvJump.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startNewActivity(MainActivity.class);
+                getActivity().finish();
+            }
+        });
+
     }
     @NonNull
@@ -70,42 +89,27 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     }
     private void initBannes(List<GuangGaoBean> guangGaoBeanList) {
+        try {
         final List<String> imgUrl = new ArrayList<>();
         List<String> describeList = new ArrayList<>();
         for (int i = 0; i < guangGaoBeanList.size(); i++) {
-            imgUrl.add(guangGaoBeanList.get(i).fileSrc);
+            imgUrl.add(AppConfig.BASE_URL_FILE+guangGaoBeanList.get(i).fileSrc);
             describeList.add(guangGaoBeanList.get(i).describe);
         }
         xBanner.setData(imgUrl, describeList);
-        xBanner.setmAutoPlayAble(false);
-        xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
-
+        xBanner.stopAutoPlay();
+        xBanner.setmAutoPalyTime(10000);
+//        xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
         xBanner.setmAdapter(new XBanner.XBannerAdapter() {
             @Override
             public void loadBanner(XBanner banner, Object model, View view, int position) {
-                Glide.with(getActivity()).load(imgUrl.get(position)).placeholder(R.drawable.ic_launcher_background)
-                        .into((ImageView) view);
+                GlideUtils.showImg(getActivity(),(ImageView) view,imgUrl.get(position));
             }
         });
-        xBanner.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                if (position == imgUrl.size() - 1) {
-                    startNewActivity(MainActivity.class);
-                }
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 }
@@ -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;
@@ -14,19 +13,25 @@ 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.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.DisplayUtils;
-import com.shunzhi.parent.AppConfig;
+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.ConsultTwoLevelActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
+import com.shunzhi.parent.util.AttrsUtils;
+import com.shunzhi.parent.util.GlideUtils;
+import com.shunzhi.parent.views.TextAndImgShowView;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +39,8 @@ 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;
@@ -42,7 +48,12 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     LinearLayout layout_control;
-    List<MyConsultBean> myConsultBeanList = null;
+
+    List<ChannelContextBean> myConsultBeanList = new ArrayList<>();
+
+    String channel = "";
+    int pageIndex;
+
     @Override
     public int getLayoutId() {
@@ -51,55 +62,44 @@ 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) {
+    private void initViews(View view) {
+        channel = getArguments().getString("channel");
+        layout_control = view.findViewById(R.id.layout_control);
+        layout_control.measure(0, 0);
+        recyclerViewGrally = view.findViewById(R.id.recyclerViewGrally);
+        recyclerViewConsultOne = view.findViewById(R.id.recyclerViewConsultOne);
-        if (null == myGrallyAdapter) myGrallyAdapter = new MyGrallyAdapter();
-        myGrallyAdapter.addAll(guangGaoBeanList);
-        recyclerViewGrally.setAdapter(myGrallyAdapter);
-        recyclerViewGrally.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        recyclerViewConsultOne.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recyclerViewConsultOne.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
+            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 onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
+            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);
-    }
-
-    private void initViews(View view) {
+        mPresenter.getBanners("4", AppContext.getInstance().district);
-        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);
-
-        mPresenter.getBanners("3","杭州");
-        initRecyclerViewConsult();
     }
-    private void initRecyclerViewConsult() {
-        if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
-        if (null == myConsultBeanList) myConsultBeanList = new ArrayList<>();
-        else myConsultBeanList.clear();
-        for (int i = 0; i < 12; i++) {
-            MyConsultBean myConsultBean = new MyConsultBean();
-            myConsultBean.consultCounts = i + "";
-            myConsultBean.consultContent = "咨询内容" + i;
-            myConsultBean.consultTitle = "咨询标题" + i;
-            myConsultBean.consultZhuanfaCounts = "转发:" + i;
-            myConsultBeanList.add(myConsultBean);
-        }
-        myConsultAdapter.addAll(myConsultBeanList);
-        recyclerViewConsultOne.setAdapter(myConsultAdapter);
-
+    public void showSearchContent(String keyword) {
+        mPresenter.getInformationTopic(keyword, AppContext.getInstance().district, channel, "0", 1);
     }
     @NonNull
@@ -121,12 +121,62 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     @Override
     public void showBanners(List<GuangGaoBean> guangGaoBeanList) {
-        Log.d("6666","imgesUrl="+guangGaoBeanList);
         initRecyclerView(guangGaoBeanList);
     }
+    private void initRecyclerView(List<GuangGaoBean> guangGaoBeanList) {
+
+        if (null == myGrallyAdapter) myGrallyAdapter = new MyGrallyAdapter();
+        myGrallyAdapter.addAll(guangGaoBeanList);
+        recyclerViewGrally.setAdapter(myGrallyAdapter);
+        recyclerViewGrally.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+            }
+
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+            }
+        });
+
+    }
+
+    @Override
+    public void showConsultContent(List<ChannelContextBean> list) {
+        myConsultBeanList.addAll(list);
+        if (myConsultAdapter == null) {
+            myConsultAdapter = new MyConsultAdapter(getActivity());
+            myConsultAdapter.addAll(myConsultBeanList);
+            recyclerViewConsultOne.setAdapter(myConsultAdapter);
+        } else {
+            myConsultAdapter.addAll(myConsultBeanList);
+            myConsultAdapter.notifyDataSetChanged();
+        }
+    }
+
     @Override
-    public void showConsultContent() {
+    public void showChannel(List<ChannelBean> list) {
+        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.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() + "", channelBean.getChannelName());
+                }
+            });
+            layout_control.addView(textAndImgShowView);
+        }
     }
     private class MyGrallyAdapter extends BaseRecyclerViewAdapter<GuangGaoBean> {
@@ -162,10 +212,15 @@ 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);
-//                iv_grally.setImageResource(R.drawable.ic_launcher_background);
-                tv_grally_title.setText(object.describe+"");
+            public void onBindViewHolder(final GuangGaoBean object, int position) {
+                GlideUtils.showImg(mContext, iv_grally, object.fileSrc);
+                tv_grally_title.setText(object.describe + "");
+                iv_grally.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        WebViewActivity.getInstance(mContext, object.url, -1);
+                    }
+                });
             }
         }
     }
 package com.shunzhi.parent.ui.fragment.consult;
-import android.content.Context;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
+import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
-import android.view.ViewGroup;
 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;
 import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter;
@@ -32,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 = "", titleName;
     @Override
     public int getLayoutId() {
@@ -46,26 +47,34 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         tvContentName = view.findViewById(R.id.tvContentName);
-        tvContentName.setText("");
-
+        tvContentName.setText(getArguments().getString("titleName"));
+        channel = getArguments().getString("channel");
         recyclerView = view.findViewById(R.id.recyclerView);
-        initRecyclerView();
-    }
-
-    private void initRecyclerView() {
-
-        if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
-        for (int i = 0; i < 12; i++) {
-            MyConsultBean myConsultBean = new MyConsultBean();
-            myConsultBean.consultCounts = i + "";
-            myConsultBean.consultContent = "咨询内容" + i;
-            myConsultBean.consultTitle = "咨询标题" + i;
-            myConsultBean.consultZhuanfaCounts = "转发:" + i;
-            myConsultBeanList.add(myConsultBean);
-        }
-        myConsultAdapter.addAll(myConsultBeanList);
-        recyclerView.setAdapter(myConsultAdapter);
+//        mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, 1);
+        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();
     }
     @NonNull
@@ -80,15 +89,23 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     }
     @Override
+    public void showConsultContent(List<ChannelContextBean> list) {
+        myConsultBeanList.clear();
+        myConsultBeanList.addAll(list);
+        if (myConsultAdapter == null) myConsultAdapter = new MyConsultAdapter(getActivity());
+        if (null == recyclerView.getAdapter()) recyclerView.setAdapter(myConsultAdapter);
+        myConsultAdapter.addAll(myConsultBeanList);
+    }
+
+    @Override
     public void showBanners(List<GuangGaoBean> guangGaoBeanList) {
     }
-    /**
-     * 显示咨询内容
-     */
     @Override
-    public void showConsultContent() {
+    public void showChannel(List<ChannelBean> list) {
     }
+
+
 }
@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,9 +31,6 @@ import com.shunzhi.parent.ui.MainActivity;
 import com.shunzhi.parent.ui.activity.LoginAndRegistActivity;
 import com.shunzhi.parent.views.MyProcessDialog;
-import java.util.Calendar;
-import java.util.Date;
-
 public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements LoginAndRegisterContract.ILoginView, View.OnClickListener {
@@ -100,7 +98,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
         phoneNumber.addTextChangedListener(textWatcher);
         idCode.addTextChangedListener(textWatcher);
         password.addTextChangedListener(textWatcher);
-        mPresenter.loginResult("18358585335", "575335");
+//        mPresenter.loginResult("18358585335", "575335");
         passwordLayout_new = view.findViewById(R.id.passwordLayout_new);
         et_password_new = view.findViewById(R.id.et_password_new);
@@ -129,12 +127,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
             back_login.setVisibility(View.VISIBLE);
         }
-        roundedImageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mPresenter.loginResult("18358585335", "123456");
-            }
-        });
+//        roundedImageView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                mPresenter.loginResult("18358575337", "575337");
+//            }
+//        });
     }
@@ -182,6 +180,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
     }
     @Override
+    public void showerror(String error) {
+        progressDialog.dismiss();
+//        ToastUtils.showToast(error);
+    }
+
+    @Override
     public void onClick(View v) {
         if (v == loginAndRegister) {
             progressDialog.show();
@@ -0,0 +1,29 @@
+package com.shunzhi.parent.util;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.R;
+
+/**
+ * Created by ToaHanDong on 2018/3/21.
+ */
+
+public class GlideUtils {
+
+    public static void showImg(Context context, ImageView imageView,String url){
+        if (!TextUtils.isEmpty(url)){
+            if (url.startsWith("http"))
+                Glide.with(context).load(url).placeholder(R.color.xueqing_blue)
+                        .into(imageView);
+            else Glide.with(context).load(AppConfig.BASE_URL_FILE+url).placeholder(R.color.xueqing_blue)
+                    .into(imageView);
+        }else {
+            Glide.with(context).load(url).placeholder(R.color.xueqing_blue).centerCrop().into(imageView);
+        }
+    }
+
+}
@@ -14,7 +14,10 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.share.mvpsdk.utils.DisplayUtils;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.util.GlideUtils;
 /**
@@ -55,6 +58,8 @@ public class TextAndImgShowView extends LinearLayout {
     }
     public void addImgs(String imgUrl){
+//        Log.d("66666","imgUrl="+imgUrl);
+        if (!imgUrl.startsWith("http"))imgUrl= AppConfig.BASE_URL_FILE+imgUrl;
         Glide.with(getContext()).load(imgUrl).error(R.drawable.gxzt).into(image);
     }
@@ -78,7 +83,7 @@ public class TextAndImgShowView extends LinearLayout {
     }
     public void setWidth(Activity activity, View layout_control) {
-        Log.d("66666", "layout_control=" + layout_control.getMeasuredWidth());
+//        Log.d("66666", "layout_control=" + layout_control.getMeasuredWidth());
         LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         params.width = (DisplayUtils.getScreenWidthPixels(activity) -
                 DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke android:color="#00000000" android:width="1dp"/>
-    <solid android:color="#D2D2D2" />
+    <solid android:color="@color/bottomline" />
     <corners android:radius="5dp"/>
 </shape>
 \ No newline at end of file
@@ -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>
@@ -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>
@@ -2,6 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/bgColor"
     android:layout_height="match_parent"
     android:orientation="vertical"
     >
@@ -24,6 +25,7 @@
         android:text="添加绑定账号"
         android:textColor="@color/white"
         android:textSize="@dimen/txtsize_title"
+        android:layout_marginBottom="@dimen/size_dp_10"
         android:gravity="center"
         android:background="@drawable/rudiobtn"
         />
@@ -102,6 +102,7 @@
         android:textSize="@dimen/txtsize_title"
         android:gravity="center"
         android:background="@drawable/rudiobtn"
+        android:layout_marginBottom="10dp"
         />
@@ -7,6 +7,111 @@
     android:orientation="vertical"
     android:background="@color/bgColor"
     tools:context="com.shunzhi.parent.ui.activity.mywebview.WebViewActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:background="@color/back_top"
+        android:layout_height="?android:actionBarSize"
+        android:orientation="horizontal"
+        >
+        <ImageView
+            android:id="@+id/close_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:paddingLeft="@dimen/size_dp_15"
+            android:src="@drawable/back"
+            android:paddingRight="@dimen/size_dp_15"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/textSize16" />
+        <TextView
+            android:id="@+id/title_web"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="订购中心"
+            android:textSize="@dimen/txtsize_title"
+            android:layout_centerInParent="true"
+            android:visibility="gone"
+            android:textColor="@color/textColor"
+
+            />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/binding_success1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:background="@color/white"
+        android:layout_marginLeft="20dp"
+        android:padding="30dp"
+        android:layout_marginRight="20dp"
+
+        >
+
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="@drawable/success_big" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:text="绑定成功"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/txtsize_headline" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/binding_success2"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:background="@color/white"
+        android:layout_marginLeft="20dp"
+        android:padding="30dp"
+        android:orientation="vertical"
+        android:layout_marginRight="20dp"
+
+        >
+        <TextView
+            android:id="@+id/tv_info"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:text="生成孩子“汇作业”账号为：sz1803081515，初始密码为：sz1803081515（与账号相同）。孩子可以下载“汇作业”app进行使用"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/txtsize_headline" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="20dp"
+                android:text="下载地址:"
+                android:textColor="@color/textColor"
+                android:textSize="@dimen/txtsize_headline" />
+            <TextView
+                android:id="@+id/zuoye"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="20dp"
+                android:text="汇作业"
+                android:gravity="center"
+                android:textColor="@color/textBlue"
+                android:textSize="@dimen/txtsize_headline" />
+        </LinearLayout>
+
+    </LinearLayout>
     <ProgressBar
         android:id="@+id/pb_web"
         style="?android:attr/progressBarStyleHorizontal"
@@ -17,6 +122,10 @@
     <com.share.mvpsdk.widgets.NestedScrollWebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/nesteScrollWebView"/>
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp"
+        android:id="@+id/nesteScrollWebView"
+        ></com.share.mvpsdk.widgets.NestedScrollWebView>
 </LinearLayout>
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/bgColor">
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:background="@color/back_top"
-        android:layout_height="?android:actionBarSize"
-        android:orientation="horizontal"
-        >
-        <TextView
-            android:id="@+id/close_btn"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginLeft="10dp"
-            android:layout_centerVertical="true"
-            android:background="@drawable/close"
-            />
-        <TextView
-            android:id="@+id/title_web"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="订购中心"
-            android:textSize="@dimen/txtsize_title"
-            android:layout_centerInParent="true"
-            android:visibility="gone"
-            android:textColor="@color/textColor"
-
-            />
-
-    </RelativeLayout>
-
-    <ProgressBar
-        android:id="@+id/pb_web"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="3dp"
-        android:progressDrawable="@drawable/web_progress_bar_bg"
-        android:visibility="gone"/>
-
-    <LinearLayout
-        android:id="@+id/binding_success1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="@color/white"
-        android:layout_marginLeft="20dp"
-        android:padding="30dp"
-        android:layout_marginRight="20dp"
-
-        >
-
-        <ImageView
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/success_big" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="绑定成功"
-            android:gravity="center"
-            android:textColor="@color/textColor"
-            android:textSize="@dimen/txtsize_headline" />
-
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/binding_success2"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="@color/white"
-        android:layout_marginLeft="20dp"
-        android:padding="30dp"
-        android:orientation="vertical"
-        android:layout_marginRight="20dp"
-
-        >
-        <TextView
-            android:id="@+id/tv_info"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="生成孩子“汇作业”账号为：sz1803081515，初始密码为：sz1803081515（与账号相同）。孩子可以下载“汇作业”app进行使用"
-            android:gravity="center"
-            android:textColor="@color/textColor"
-            android:textSize="@dimen/txtsize_headline" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            >
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="下载地址:"
-            android:textColor="@color/textColor"
-            android:textSize="@dimen/txtsize_headline" />
-        <TextView
-            android:id="@+id/zuoye"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="汇作业"
-            android:gravity="center"
-            android:textColor="@color/textBlue"
-            android:textSize="@dimen/txtsize_headline" />
-        </LinearLayout>
-
-    </LinearLayout>
-    <com.share.mvpsdk.widgets.NestedScrollWebView
-        android:id="@+id/webView"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginLeft="20dp"
-        />
-
-</LinearLayout>
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="300dp"
+    android:layout_width="260dp"
     android:layout_gravity="center"
     android:layout_height="wrap_content"
     android:background="#00000000"
@@ -8,11 +8,12 @@
     <TextView
         android:id="@+id/dialog_info"
-        android:layout_width="300dp"
-        android:layout_height="200dp"
+        android:layout_width="260dp"
+        android:layout_height="180dp"
         android:gravity="center"
-        android:textSize="@dimen/txtsize_headline"
+        android:textSize="@dimen/sp_18"
         android:layout_gravity="center"
+        android:padding="@dimen/size_dp_10"
         android:background="@drawable/rudiobtn_white" />
     <LinearLayout
@@ -22,22 +23,22 @@
         <TextView
             android:id="@+id/cancel_btn"
-            android:layout_width="140dp"
+            android:layout_width="120dp"
             android:layout_height="40dp"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="@dimen/txtsize_title"
+            android:textSize="@dimen/sp_16"
             android:background="@drawable/rudiobtn"
             android:text="取消" />
         <TextView
             android:id="@+id/right_btn"
             android:layout_marginLeft="20dp"
-            android:layout_width="140dp"
+            android:layout_width="120dp"
             android:layout_height="40dp"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="@dimen/txtsize_title"
+            android:textSize="@dimen/sp_16"
             android:background="@drawable/rudiobtn"
             android:text="确定" />
     </LinearLayout>
@@ -164,8 +164,15 @@
                 android:layout_height="match_parent"
                 android:layout_marginRight="@dimen/size_dp_5"
                 android:layout_weight="1"
+                android:onClick="onClick"
                 android:background="@drawable/shape_xueqing_radius8">
-
+                <ImageView
+                    android:layout_margin="@dimen/size_dp_8"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="fitXY"
+                    android:id="@+id/ivCourse1"
+                    />
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -175,6 +182,7 @@
                     android:orientation="vertical">
                     <TextView
+                        android:id="@+id/tvCourse1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="热门课程"
@@ -209,8 +217,15 @@
                     android:layout_marginBottom="@dimen/size_dp_5"
                     android:layout_marginRight="@dimen/size_dp_5"
                     android:layout_weight="1"
+                    android:onClick="onClick"
                     android:background="@drawable/shape_xueqing_radius8">
-
+                    <ImageView
+                        android:layout_margin="@dimen/size_dp_8"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="fitXY"
+                        android:id="@+id/ivCourse2"
+                        />
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -220,6 +235,7 @@
                         android:orientation="vertical">
                         <TextView
+                            android:id="@+id/tvCourse2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="热门课程"
@@ -247,8 +263,15 @@
                     android:layout_marginRight="@dimen/size_dp_5"
                     android:layout_marginTop="@dimen/size_dp_5"
                     android:layout_weight="1"
+                    android:onClick="onClick"
                     android:background="@drawable/shape_xueqing_radius8">
-
+                    <ImageView
+                        android:layout_margin="@dimen/size_dp_8"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="fitXY"
+                        android:id="@+id/ivCourse3"
+                        />
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -258,6 +281,7 @@
                         android:orientation="vertical">
                         <TextView
+                            android:id="@+id/tvCourse3"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="热门课程"
@@ -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>
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     tools:context="com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment">
@@ -20,7 +21,7 @@
                 android:layout_width="60dp"
                 android:layout_height="20dp"
                 android:visibility="invisible"
-                android:src="@drawable/arrow_left"
+                android:src="@drawable/back"
                 />
         </LinearLayout>
@@ -59,6 +60,7 @@
                     android:text=""
                     android:maxLength="11"
                     android:textColorHint="@color/hintTextColor"
+                    android:textColor="@color/textColor"
                     android:textSize="@dimen/sp_16" />
                 <TextView
@@ -86,6 +88,7 @@
                         android:background="@null"
                         android:hint="请输入验证码"
                         android:textColorHint="@color/hintTextColor"
+                        android:textColor="@color/textColor"
                         android:textSize="@dimen/sp_16" />
                     <TextView
@@ -197,6 +200,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="40dp"
                 android:background="@drawable/rudiobtn_unclick"
+                android:enabled="false"
                 android:gravity="center"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp"
@@ -99,7 +99,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"
@@ -136,7 +136,7 @@
                 <LinearLayout
                     android:id="@+id/layout_orderDetail"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
                     >
@@ -167,7 +167,7 @@
                 <LinearLayout
                     android:id="@+id/layout_order"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
                     >
@@ -197,7 +197,7 @@
                 <LinearLayout
                     android:id="@+id/childlayout"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
                     >
@@ -217,6 +217,7 @@
                         android:textSize="@dimen/txtsize_title" />
                     <TextView
+                        android:id="@+id/binding_state"
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -238,9 +239,10 @@
                 android:orientation="vertical">
                 <LinearLayout
+                    android:id="@+id/layoutAdvice"
                     android:layout_width="match_parent"
                     android:gravity="center_vertical"
-                    android:layout_height="40dp">
+                    android:layout_height="?android:actionBarSize">
                     <TextView
                         android:layout_width="25dp"
@@ -267,8 +269,9 @@
                     android:background="@color/bottomline" />
                 <LinearLayout
+                    android:id="@+id/layout_cache"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
                     >
@@ -296,11 +299,12 @@
                     android:layout_marginLeft="15dp"
                     android:layout_marginRight="15dp"
                     android:background="@color/bottomline" />
+
                 <LinearLayout
+                    android:id="@+id/layout_about"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:gravity="center_vertical"
-                    >
+                    android:layout_height="?android:actionBarSize"
+                    android:gravity="center_vertical">
                     <TextView
                         android:layout_width="25dp"
@@ -320,7 +324,19 @@
                 </LinearLayout>
             </LinearLayout>
-
+            <TextView
+                android:id="@+id/tvExit"
+                android:layout_width="match_parent"
+                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:background="@drawable/shape_xueqing_radius8"
+                android:text="退出登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/size_dp_16" />
         </LinearLayout>
 </ScrollView>
@@ -15,12 +15,13 @@
         android:padding="10dp">
         <TextView
+            android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:drawablePadding="10dp"
             android:drawableRight="@drawable/pull"
-            android:text="马铂骞"
+            android:text=""
             android:textColor="@color/textColor"
             android:textSize="@dimen/textSize16" />
@@ -46,6 +47,17 @@
             android:textSize="@dimen/textSize16" />
     </LinearLayout>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textSize="@dimen/size_dp_16"
+        android:textColor="@color/xueqing_blue"
+        android:text="没有绑定孩子，\n请去个人中心绑定孩子"
+        android:gravity="center"
+        android:lineSpacingExtra="@dimen/size_dp_5"
+        android:id="@+id/tvNoData"
+        />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bgColor"
     tools:context="com.shunzhi.parent.ui.fragment.StartFragment">
     <com.stx.xhb.xbanner.XBanner
@@ -9,4 +10,17 @@
         android:layout_height="match_parent"
         android:id="@+id/xBanner"
         ></com.stx.xhb.xbanner.XBanner>
+
+    <TextView
+        android:id="@+id/tvJump"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="跳过"
+        android:textColor="@color/white"
+        android:textSize="@dimen/size_dp_16"
+        android:padding="@dimen/size_dp_10"
+        android:layout_gravity="right"
+        android:layout_margin="@dimen/size_dp_10"
+        android:background="@drawable/shape_xueqing_radius8"
+        />
 </FrameLayout>
@@ -14,20 +14,17 @@
         android:layout_height="0dp"
         android:layout_weight="2"></com.stx.xhb.xbanner.XBanner>
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        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
@@ -41,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">
@@ -60,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"
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/white"
+    android:divider="@color/divider_gray"
+    android:layout_marginTop="@dimen/size_dp_10"
     android:layout_height="wrap_content">
     <LinearLayout
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:elevation="@dimen/size_dp_5"
+    android:layout_margin="@dimen/size_dp_5"
     android:background="@drawable/shape_xueqing_radius8"
     android:id="@+id/layout_order_list"
     android:layout_height="wrap_content">
@@ -44,20 +45,35 @@
         android:background="@drawable/shape_radius8_whit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+        <LinearLayout
+            android:paddingBottom="@dimen/size_dp_5"
+            android:paddingTop="@dimen/size_dp_5"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+
+            <ImageView
+                android:id="@+id/ivState"
+                android:layout_width="@dimen/size_dp_20"
+                android:layout_height="@dimen/size_dp_20"
+                android:src="@drawable/success"
+                android:layout_marginRight="@dimen/size_dp_5"
+                />
+
+            <TextView
+                android:id="@+id/tvPayState"
+                android:layout_gravity="center"
+                android:drawablePadding="@dimen/size_dp_5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="订购成功"
+                android:textColor="@color/xueqing_blue"
+                android:textSize="@dimen/textSize16"
+                android:gravity="center"
+                />
+        </LinearLayout>
-    <TextView
-        android:id="@+id/tvPayState"
-        android:layout_gravity="center"
-        android:drawablePadding="@dimen/size_dp_5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="订购成功"
-        android:textColor="@color/xueqing_blue"
-        android:textSize="@dimen/textSize16"
-        android:gravity="center"
-        android:paddingBottom="@dimen/size_dp_5"
-        android:paddingTop="@dimen/size_dp_5"
-        android:drawableLeft="@drawable/order_success"
-        />
     </FrameLayout>
 </LinearLayout>
 \ No newline at end of file
@@ -2,9 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/size_dp_10">
+    android:layout_marginBottom="@dimen/size_dp_10"
+    android:orientation="vertical">
     <LinearLayout
+        android:id="@+id/normal_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/report_white">
@@ -77,4 +79,19 @@
             android:layout_weight="2"
             android:src="@color/xueqing_blue" />
     </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/frame_ad"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        >
+
+        <ImageView
+            android:id="@+id/image_ad"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/backgroud_top" />
+
+    </FrameLayout>
 </LinearLayout>
 \ No newline at end of file
@@ -5,12 +5,16 @@
     android:background="@color/back_top"
     android:padding="10dp">
-    <TextView
+    <ImageView
         android:id="@+id/back_top"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_gravity="center_vertical"
-        android:background="@drawable/arrow_left" />
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:paddingLeft="@dimen/size_dp_15"
+        android:src="@drawable/back"
+        android:paddingRight="@dimen/size_dp_15"
+        android:textColor="@color/textColor"
+        android:textSize="@dimen/textSize16" />
     <TextView
         android:id="@+id/center_title"
@@ -19,7 +23,7 @@
         android:layout_weight="1"
         android:text="主题"
         android:gravity="center"
-        android:textColor="@color/textColor"
+        android:textColor="@color/white"
         android:textSize="@dimen/textSize16" />
     <TextView
         android:layout_width="30dp"
@@ -5,7 +5,7 @@
     <color name="colorAccent">#FF4081</color>
-    <color name="hintTextColor">#C1C1C1</color>
+    <color name="hintTextColor">#494947</color>
     <color name="bottomline">#B8B8B9</color>
     <color name="bg_main">#F0EFF5</color>
     <color name="textRed">#FC5B6A</color>
 <resources>
-    <string name="app_name">parent</string>
+    <string name="app_name">家长慧</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
@@ -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'
@@ -24,12 +24,13 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class RetrofitCreateHelper {
     private static final int TIMEOUT_READ = 20;
     private static final int TIMEOUT_CONNECTION = 10;
-    private static String Authorization="",token="";
-    private static RetrofitCreateHelper retrofitCreateHelper=null;
+    private static String Authorization = "", token = "";
+    private static RetrofitCreateHelper retrofitCreateHelper = null;
     private static final HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor()
             .setLevel(HttpLoggingInterceptor.Level.BODY);
     private static CacheInterceptor cacheInterceptor = new CacheInterceptor();
-    private static OkHttpClient.Builder okhttpClientBuilder=null;
+    private static OkHttpClient.Builder okhttpClientBuilder = null;
+
     /*private static OkHttpClient okHttpClient = new OkHttpClient.Builder()
             //SSL证书
             .sslSocketFactory(TrustManager.getUnsafeOkHttpClient())
@@ -47,33 +48,39 @@ public class RetrofitCreateHelper {
             //失败重连
             .retryOnConnectionFailure(true)
             .build();*/
-    public static RetrofitCreateHelper getInstance(){
-        if (null==retrofitCreateHelper){
-            synchronized (RetrofitCreateHelper.class){
-                if (null==retrofitCreateHelper)retrofitCreateHelper=new RetrofitCreateHelper();
+    public static RetrofitCreateHelper getInstance() {
+        if (null == retrofitCreateHelper) {
+            synchronized (RetrofitCreateHelper.class) {
+                if (null == retrofitCreateHelper) retrofitCreateHelper = new RetrofitCreateHelper();
             }
         }
         return retrofitCreateHelper;
     }
-    public RetrofitCreateHelper(){
-        if (null==okhttpClientBuilder)okhttpClientBuilder=new OkHttpClient.Builder();
-        okhttpClientBuilder.connectTimeout(10000,TimeUnit.SECONDS);
-        okhttpClientBuilder.addInterceptor(new Interceptor() {
-            @Override
-            public Response intercept(Chain chain) throws IOException {
-                Request original = chain.request();
-                Request.Builder requestBuilder = original.newBuilder().header("Authorization", Authorization);
-                Request request = requestBuilder.build();
-                return chain.proceed(request);
+    public RetrofitCreateHelper() {
+        try {
+            if (null == okhttpClientBuilder) {
+                okhttpClientBuilder = new OkHttpClient.Builder();
+                okhttpClientBuilder.connectTimeout(10000, TimeUnit.SECONDS);
+                okhttpClientBuilder.addInterceptor(new Interceptor() {
+                    @Override
+                    public Response intercept(Chain chain) throws IOException {
+                        Request original = chain.request();
+                        Request.Builder requestBuilder = original.newBuilder().header("Authorization", Authorization);
+                        Request request = requestBuilder.build();
+                        return chain.proceed(request);
+                    }
+                });
+                okhttpClientBuilder.addNetworkInterceptor(cacheInterceptor);
+                okhttpClientBuilder.addInterceptor(interceptor);
             }
-        });
-        okhttpClientBuilder.addNetworkInterceptor(cacheInterceptor);
-        okhttpClientBuilder.addInterceptor(interceptor);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
     public <T> T createApi(Class<T> clazz, String url) {
-        Authorization=token;
+        Authorization = token;
         Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl(url)
                 .client(okhttpClientBuilder.build())
@@ -83,7 +90,7 @@ public class RetrofitCreateHelper {
         return retrofit.create(clazz);
     }
-//    public static <T> T loginApi(Class<T> clazz, String url) {
+    //    public static <T> T loginApi(Class<T> clazz, String url) {
 //        Authorization= StringUtils.getSign();
 //        okHttpClient.newBuilder().addInterceptor(new Interceptor() {
 //            @Override
@@ -103,13 +110,13 @@ public class RetrofitCreateHelper {
 //                .build();
 //        return retrofit.create(clazz);
 //    }
-    public  void setAuthorization(String Authorization){
-        this.token=Authorization;
+    public void setAuthorization(String Authorization) {
+        this.token = Authorization;
     }
-    public <T> T login(Class<T> clazz,String url){
-        Authorization= StringUtils.getSign();
-        Retrofit retrofit=new Retrofit.Builder()
+    public <T> T login(Class<T> clazz, String url) {
+        Authorization = StringUtils.getSign();
+        Retrofit retrofit = new Retrofit.Builder()
                 .client(okhttpClientBuilder.build())
                 .baseUrl(url)
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
@@ -119,6 +126,5 @@ public class RetrofitCreateHelper {
     }
-
 }
@@ -96,6 +96,11 @@ public class CacheUtils {
         cleanCustomCache(filepath);
     }
+    public static void clearCache(Context context)throws Exception{
+        File file=new File("/data/data/"+ context.getPackageName());
+        cleanCustomCache(file.toString());
+    }
+
     public static String getCacheSize(Context context) throws Exception {
         File file=new File("/data/data/"+ context.getPackageName());
         return getFormatSize(getFolderSize(file));
	@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
		1	+<component name="InspectionProjectProfileManager">
		2	+ <settings>
		3	+ <option name="PROJECT_PROFILE" />
		4	+ <version value="1.0" />
		5	+ </settings>
		6	+</component>
0	\ No newline at end of file	7	\ No newline at end of file
	@@ -1,66 +0,0 @@	@@ -1,66 +0,0 @@
1	-package com.shunzhi.parent.adapter;
2	-
3	-import android.content.Context;
4	-import android.view.LayoutInflater;
5	-import android.view.View;
6	-import android.view.ViewGroup;
7	-import android.widget.ImageView;
8	-import android.widget.TextView;
9	-
10	-import com.bumptech.glide.Glide;
11	-import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
12	-import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
13	-import com.shunzhi.parent.R;
14	-import com.shunzhi.parent.bean.channel.ChannelContextBean;
15	-
16	-/**
17	- * Created by lenovo on 2018/3/18.
18	- */
19	-
20	-public class ContextAdapter extends BaseRecyclerViewAdapter<ChannelContextBean>{
21	- Context context;
22	-
23	- public ContextAdapter(Context context) {
24	- this.context = context;
25	- }
26	-
27	-
28	- @Override
29	- public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
30	- View view = LayoutInflater.from(context).inflate(R.layout.layout_consult_content, null);
31	- return new MyViewHolder(view);
32	- }
33	-
34	- private class MyViewHolder extends BaseRecyclerViewHolder<ChannelContextBean> {
35	- TextView tvConsultTitle,tvConsultContent,tvPingLunNums,tvZhuanFaNums;
36	- ImageView iv_consult;
37	-
38	-
39	- public MyViewHolder(View view) {
40	- super(view);
41	- tvConsultContent=view.findViewById(R.id.tvConsultContent);
42	- tvConsultTitle=view.findViewById(R.id.tvConsultTitle);
43	- tvPingLunNums=view.findViewById(R.id.tvPingLunNums);
44	- tvZhuanFaNums=view.findViewById(R.id.tvZhuanFaNums);
45	- iv_consult=view.findViewById(R.id.iv_consult);
46	-
47	- }
48	-
49	- @Override
50	- public void onBindViewHolder(final ChannelContextBean object, int position) {
51	- tvConsultTitle.setText(object.getTitle());
52	- tvConsultContent.setText(object.getContent());
53	- Glide.with(context).load(object.getImage()).placeholder(R.color.xueqing_blue)
54	- .into(iv_consult);
55	-
56	-
57	-
58	-
59	-
60	- }
61	-
62	- }
63	-
64	-
65	-
66	-}
	@@ -31,7 +31,7 @@ public interface CepingContract {		@@ -31,7 +31,7 @@ public interface CepingContract {
31		31
32	interface ICePingView extends IBaseFragment{	32	interface ICePingView extends IBaseFragment{
33		33
34	- void showTools();	34	+ void showTools(List<ToolBean> toolBeanList);
35		35
36	}	36	}
37		37
	@@ -45,6 +45,7 @@ public interface LoginAndRegisterContract {		@@ -45,6 +45,7 @@ public interface LoginAndRegisterContract {
45		45
46	//更新用户信息	46	//更新用户信息
47	void getUserInfo(int type);	47	void getUserInfo(int type);
		48	+ void showerror(String error);
48		49
49	}	50	}
50		51
	@@ -41,7 +41,7 @@ public interface MyChildContract {		@@ -41,7 +41,7 @@ public interface MyChildContract {
41		41
42	interface IMyChildView extends IBaseActivity {	42	interface IMyChildView extends IBaseActivity {
43	void updateChildList(CurrentBean currentBean);	43	void updateChildList(CurrentBean currentBean);
44	- void addChildSuccess();	44	+ void addChildSuccess(String account,String password);
45	void showClass(List<ChildClass>list);	45	void showClass(List<ChildClass>list);
46	void showError(String error);	46	void showError(String error);
47		47
1	package com.shunzhi.parent.presenter.consult.consultone;	1	package com.shunzhi.parent.presenter.consult.consultone;
2		2
		3	+import android.util.Log;
3	import android.view.View;	4	import android.view.View;
4	import android.widget.LinearLayout;	5	import android.widget.LinearLayout;
5		6
6	import com.google.gson.Gson;	7	import com.google.gson.Gson;
7	import com.google.gson.JsonArray;	8	import com.google.gson.JsonArray;
8	import com.google.gson.JsonObject;	9	import com.google.gson.JsonObject;
		10	+import com.share.mvpsdk.utils.OkHttpExceptionUtil;
9	import com.share.mvpsdk.utils.ToastUtils;	11	import com.share.mvpsdk.utils.ToastUtils;
10	import com.shunzhi.parent.R;	12	import com.shunzhi.parent.R;
11	import com.shunzhi.parent.bean.GuangGaoBean;	13	import com.shunzhi.parent.bean.GuangGaoBean;
12	import com.shunzhi.parent.bean.ToolBean;	14	import com.shunzhi.parent.bean.ToolBean;
		15	+import com.shunzhi.parent.bean.channel.ChannelBean;
		16	+import com.shunzhi.parent.bean.channel.ChannelContextBean;
		17	+import com.shunzhi.parent.bean.channel.ChannelInfo;
13	import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;	18	import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
14	import com.shunzhi.parent.model.consult.consultone.ConsultOneModel;	19	import com.shunzhi.parent.model.consult.consultone.ConsultOneModel;
15	import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;	20	import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;
	@@ -20,6 +25,7 @@ import java.util.ArrayList;		@@ -20,6 +25,7 @@ import java.util.ArrayList;
20	import java.util.List;	25	import java.util.List;
21		26
22	import io.reactivex.functions.Consumer;	27	import io.reactivex.functions.Consumer;
		28	+import retrofit2.HttpException;
23		29
24	/**	30	/**
25	* Created by ToaHanDong on 2018/3/14.	31	* Created by ToaHanDong on 2018/3/14.
	@@ -46,7 +52,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{		@@ -46,7 +52,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
46	textAndImgShowView.setOnClickListener(new View.OnClickListener() {	52	textAndImgShowView.setOnClickListener(new View.OnClickListener() {
47	@Override	53	@Override
48	public void onClick(View view) {	54	public void onClick(View view) {
49	- ConsultTwoLevelActivity.getInstance(mIView.getBindActivity());	55	+// ConsultTwoLevelActivity.getInstance(mIView.getBindActivity());
50	}	56	}
51	});	57	});
52	}	58	}
	@@ -67,7 +73,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{		@@ -67,7 +73,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
67	}	73	}
68	mIView.showBanners(guangGaoBeanList);	74	mIView.showBanners(guangGaoBeanList);
69	}else {	75	}else {
70	- ToastUtils.showToast(jsonObject.get("message").getAsString());	76	+// ToastUtils.showToast(jsonObject.get("message").getAsString());
71	}	77	}
72	}	78	}
73	}, new Consumer<Throwable>() {	79	}, new Consumer<Throwable>() {
	@@ -80,7 +86,48 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{		@@ -80,7 +86,48 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
80		86
81	@Override	87	@Override
82	public void getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex) {	88	public void getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex) {
		89	+ mRxManager.register(mIModel.getConsultContent(areaName, channel, toFirstPage, pageIndex).subscribe(new Consumer<JsonObject>() {
		90	+ @Override
		91	+ public void accept(JsonObject jsonObject) throws Exception {
		92	+ JsonObject json=jsonObject.getAsJsonObject("data");
		93	+ Gson g=new Gson();
		94	+ ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class);
		95	+// Log.e("ssss-===",channelInfo.toString());
		96	+ List<ChannelContextBean> contextList = channelInfo.getChannelContent();
		97	+ List<ChannelBean> channelList = channelInfo.getSubchannel();
		98	+ mIView.showChannel(channelList);
		99	+ mIView.showConsultContent(contextList);
		100	+ }
		101	+ }, new Consumer<Throwable>() {
		102	+ @Override
		103	+ public void accept(Throwable throwable) throws Exception {
		104	+ OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
		105	+ }
		106	+ }));
		107	+
		108	+
		109	+ }
83		110
		111	+ @Override
		112	+ public void getInformationTopic(String keyword, String areaName, String channel, String toFirstPage,int pageIndex) {
		113	+ mRxManager.register(mIModel.getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).subscribe(new Consumer<JsonObject>() {
		114	+ @Override
		115	+ public void accept(JsonObject jsonObject) throws Exception {
		116	+ JsonObject json=jsonObject.getAsJsonObject("data");
		117	+ Gson g=new Gson();
		118	+ ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class);
		119	+// Log.e("ssss-===",channelInfo.toString());
		120	+ List<ChannelContextBean> contextList = channelInfo.getChannelContent();
		121	+ List<ChannelBean> channelList = channelInfo.getSubchannel();
		122	+ mIView.showChannel(channelList);
		123	+ mIView.showConsultContent(contextList);
		124	+ }
		125	+ }, new Consumer<Throwable>() {
		126	+ @Override
		127	+ public void accept(Throwable throwable) throws Exception {
		128	+ OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
		129	+ }
		130	+ }));
84	}	131	}
85		132
86		133
	@@ -34,7 +34,7 @@ public class PersonInfoPrasenter extends PersonInfoContract.PersonInfoPresenter		@@ -34,7 +34,7 @@ public class PersonInfoPrasenter extends PersonInfoContract.PersonInfoPresenter
34	public void accept(JsonObject jsonObject) throws Exception {	34	public void accept(JsonObject jsonObject) throws Exception {
35	try {	35	try {
36	if(jsonObject!=null&&jsonObject.get("data").getAsBoolean()) {	36	if(jsonObject!=null&&jsonObject.get("data").getAsBoolean()) {
37	- ToastUtils.showToast(jsonObject.toString());	37	+// ToastUtils.showToast(jsonObject.toString());
38	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, parentName);	38	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, parentName);
39	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(sex));	39	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(sex));
40	mIView.updateInfo();	40	mIView.updateInfo();
1	package com.shunzhi.parent.ui.fragment;	1	package com.shunzhi.parent.ui.fragment;
2		2
		3	+import android.app.AlertDialog;
		4	+import android.content.DialogInterface;
3	import android.content.Intent;	5	import android.content.Intent;
4	import android.os.Bundle;	6	import android.os.Bundle;
5	import android.support.annotation.NonNull;	7	import android.support.annotation.NonNull;
	@@ -9,11 +11,10 @@ import android.view.View;		@@ -9,11 +11,10 @@ import android.view.View;
9	import android.widget.LinearLayout;	11	import android.widget.LinearLayout;
10	import android.widget.TextView;	12	import android.widget.TextView;
11		13
12	-import com.bumptech.glide.Glide;
13	import com.makeramen.roundedimageview.RoundedImageView;	14	import com.makeramen.roundedimageview.RoundedImageView;
14	import com.share.mvpsdk.base.BasePresenter;	15	import com.share.mvpsdk.base.BasePresenter;
15	import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;	16	import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
16	-import com.share.mvpsdk.utils.ToastUtils;	17	+import com.share.mvpsdk.utils.CacheUtils;
17	import com.shunzhi.parent.AppConfig;	18	import com.shunzhi.parent.AppConfig;
18	import com.shunzhi.parent.AppContext;	19	import com.shunzhi.parent.AppContext;
19	import com.shunzhi.parent.R;	20	import com.shunzhi.parent.R;
	@@ -25,12 +26,13 @@ import com.shunzhi.parent.ui.activity.MyChildActivity;		@@ -25,12 +26,13 @@ import com.shunzhi.parent.ui.activity.MyChildActivity;
25	import com.shunzhi.parent.ui.activity.PersonInfoActivity;	26	import com.shunzhi.parent.ui.activity.PersonInfoActivity;
26	import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;	27	import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
27	import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;	28	import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
		29	+import com.shunzhi.parent.util.GlideUtils;
28		30
29	public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>	31	public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
30	implements MineContract.IMineView, View.OnClickListener {	32	implements MineContract.IMineView, View.OnClickListener {
31	- LinearLayout childlayout, personinfo, layout_orderDetail, layout_order;	33	+ LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about,layoutAdvice;
32	RoundedImageView user_photo;	34	RoundedImageView user_photo;
33	- TextView user_name, user_mobile;	35	+ TextView user_name, user_mobile, tvExit, binding_state;
34		36
35	@NonNull	37	@NonNull
36	@Override	38	@Override
	@@ -49,6 +51,12 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract		@@ -49,6 +51,12 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
49	personinfo = view.findViewById(R.id.personinfo);	51	personinfo = view.findViewById(R.id.personinfo);
50	layout_order = view.findViewById(R.id.layout_order);	52	layout_order = view.findViewById(R.id.layout_order);
51	layout_orderDetail = view.findViewById(R.id.layout_orderDetail);	53	layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
		54	+ layout_cache = view.findViewById(R.id.layout_cache);
		55	+ layout_about = view.findViewById(R.id.layout_about);
		56	+ layoutAdvice=view.findViewById(R.id.layoutAdvice);
		57	+ layoutAdvice.setOnClickListener(this);
		58	+ layout_about.setOnClickListener(this);
		59	+ layout_cache.setOnClickListener(this);
52	childlayout.setOnClickListener(this);	60	childlayout.setOnClickListener(this);
53	personinfo.setOnClickListener(this);	61	personinfo.setOnClickListener(this);
54	layout_order.setOnClickListener(this);	62	layout_order.setOnClickListener(this);
	@@ -56,17 +64,22 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract		@@ -56,17 +64,22 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
56	user_photo = view.findViewById(R.id.user_photo);	64	user_photo = view.findViewById(R.id.user_photo);
57	user_name = view.findViewById(R.id.user_name);	65	user_name = view.findViewById(R.id.user_name);
58	user_mobile = view.findViewById(R.id.user_mobile);	66	user_mobile = view.findViewById(R.id.user_mobile);
		67	+ tvExit = view.findViewById(R.id.tvExit);
		68	+ tvExit.setOnClickListener(this);
		69	+ binding_state = view.findViewById(R.id.binding_state);
		70	+ if (AppConfig.ISBINDING) {
		71	+ binding_state.setText("");
		72	+ }
59		73
60	}	74	}
61		75
62	- private void setPersonInfo() {	76	+ private void setPersonInfo() {
63	if (AppConfig.ISLOGIN) {	77	if (AppConfig.ISLOGIN) {
64	String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);	78	String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
65	- ToastUtils.showToast(url);
66	if (!TextUtils.isEmpty(url)) {	79	if (!TextUtils.isEmpty(url)) {
67	- Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);	80	+ GlideUtils.showImg(getContext(),user_photo,url);
68	} else {	81	} else {
69	- Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);	82	+ GlideUtils.showImg(getContext(),user_photo,url);
70	user_photo.setCornerRadius(20);	83	user_photo.setCornerRadius(20);
71	}	84	}
72	user_photo.setCornerRadius(20);	85	user_photo.setCornerRadius(20);
	@@ -74,6 +87,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract		@@ -74,6 +87,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
74	user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));	87	user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
75	user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));	88	user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
76	user_mobile.setVisibility(View.VISIBLE);	89	user_mobile.setVisibility(View.VISIBLE);
		90	+ }else {
		91	+ user_name.setVisibility(View.VISIBLE);
		92	+ user_mobile.setVisibility(View.GONE);
77	}	93	}
78	}	94	}
79		95
	@@ -97,14 +113,66 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract		@@ -97,14 +113,66 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
97	Bundle bundle = new Bundle();	113	Bundle bundle = new Bundle();
98	bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +	114	bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
99	AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));	115	AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
100	- bundle.putInt("type",AppConfig.ORDER_CENTER);	116	+ bundle.putInt("type", AppConfig.ORDER_CENTER);
101	startNewActivity(WebViewActivity.class, bundle);	117	startNewActivity(WebViewActivity.class, bundle);
102	break;	118	break;
		119	+ case R.id.tvExit:
		120	+ clearUerinfo();
		121	+ break;
		122	+ case R.id.layout_cache:
		123	+ clearMyCache();
		124	+ break;
		125	+ case R.id.layout_about:
		126	+ WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"About.html",-1);
		127	+ break;
		128	+ case R.id.layoutAdvice:
		129	+ WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"FeedBack.aspx?userid="+AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID),-1);
		130	+ break;
103	default:	131	default:
104	break;	132	break;
105	}	133	}
106	}	134	}
107		135
		136	+ private void clearMyCache() {
		137	+
		138	+ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
		139	+ try {
		140	+ builder.setMessage("清理缓存" + CacheUtils.getCacheSize(getActivity()) + "")
		141	+ .setPositiveButton("取消", new DialogInterface.OnClickListener() {
		142	+ @Override
		143	+ public void onClick(DialogInterface dialogInterface, int i) {
		144	+ dialogInterface.dismiss();
		145	+ }
		146	+ })
		147	+ .setNegativeButton("确定", new DialogInterface.OnClickListener() {
		148	+ @Override
		149	+ public void onClick(DialogInterface dialogInterface, int i) {
		150	+ try {
		151	+ CacheUtils.clearCache(getActivity());
		152	+ } catch (Exception e) {
		153	+ e.printStackTrace();
		154	+ }
		155	+ dialogInterface.dismiss();
		156	+ }
		157	+ });
		158	+ } catch (Exception e) {
		159	+ e.printStackTrace();
		160	+ }
		161	+ builder.create().show();
		162	+ }
		163	+
		164	+ private void clearUerinfo() {
		165	+ if(AppConfig.ISLOGIN) {
		166	+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, "");
		167	+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, "");
		168	+ AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, "");
		169	+ AppConfig.ISLOGIN = false;
		170	+ setPersonInfo();
		171	+ startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
		172	+ getActivity().finish();
		173	+ }
		174	+ }
		175	+
108	@Override	176	@Override
109	public void onResume() {	177	public void onResume() {
110	super.onResume();	178	super.onResume();
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+package com.shunzhi.parent.util;
	2	+
	3	+import android.content.Context;
	4	+import android.text.TextUtils;
	5	+import android.widget.ImageView;
	6	+
	7	+import com.bumptech.glide.Glide;
	8	+import com.shunzhi.parent.AppConfig;
	9	+import com.shunzhi.parent.R;
	10	+
	11	+/**
	12	+ * Created by ToaHanDong on 2018/3/21.
	13	+ */
	14	+
	15	+public class GlideUtils {
	16	+
	17	+ public static void showImg(Context context, ImageView imageView,String url){
	18	+ if (!TextUtils.isEmpty(url)){
	19	+ if (url.startsWith("http"))
	20	+ Glide.with(context).load(url).placeholder(R.color.xueqing_blue)
	21	+ .into(imageView);
	22	+ else Glide.with(context).load(AppConfig.BASE_URL_FILE+url).placeholder(R.color.xueqing_blue)
	23	+ .into(imageView);
	24	+ }else {
	25	+ Glide.with(context).load(url).placeholder(R.color.xueqing_blue).centerCrop().into(imageView);
	26	+ }
	27	+ }
	28	+
	29	+}
1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">	2	<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
3	<stroke android:color="#00000000" android:width="1dp"/>	3	<stroke android:color="#00000000" android:width="1dp"/>
4	- <solid android:color="#D2D2D2" />	4	+ <solid android:color="@color/bottomline" />
5	<corners android:radius="5dp"/>	5	<corners android:radius="5dp"/>
6	</shape>	6	</shape>
7	\ No newline at end of file	7	\ No newline at end of file