no message

姚旭斌
1 parent 864e9f4c
Showing 13 changed files with 145 additions and 64 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/AppConfig.java
app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java
app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
app/src/main/res/layout/activity_web_view.xml
app/src/main/res/layout/fragment_mine.xml
app/src/main/res/layout/top.xml
@@ -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;
@@ -12,14 +12,13 @@ import android.widget.TextView;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
 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;
  
 /**
  * Created by ToaHanDong on 2018/3/14.
  */
  
-public class MyConsultAdapter extends BaseRecyclerViewAdapter<MyConsultBean> {
+public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean> {
  
     private Context mContext=null;
  
@@ -41,7 +40,7 @@ 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;
@@ -55,11 +54,11 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter&lt;MyConsultBean&gt; {
         }
  
         @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(ChannelContextBean object, int position) {
+            tvConsultContent.setText(object.getContent());
+            tvConsultTitle.setText(object.getTitle());
+//            tvPingLunNums.setText(object.getForwardingNum());
+//            tvZhuanFaNums.setText(object.getTalkNum());
         }
     }
 }
@@ -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;
  
@@ -39,7 +41,9 @@ public interface ConsultOneContract {
  
         void showBanners(List<GuangGaoBean> guangGaoBeanList);
  
-        void showConsultContent();
+        void showConsultContent(List<ChannelContextBean> list);
+
+        void showChannel(List<ChannelBean> list);
  
  
     }
@@ -6,7 +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.bean.GuangGaoBean;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
  
 import io.reactivex.Observable;
@@ -35,6 +34,9 @@ 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());
     }
+
+
+
 }
 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.
@@ -80,6 +86,26 @@ 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 {
+                ToastUtils.showToast(jsonObject.toString());
+                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);
+            }
+        }));
+
  
     }
  
@@ -139,6 +139,9 @@ 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;
+                    }
                     mIView.getUserInfo(0);
  
                 } else {
@@ -46,6 +46,14 @@ public class WebViewActivity extends BaseCompatActivity {
         zuoye = findViewById(R.id.zuoye);
         title_web = findViewById(R.id.title_web);
  
+        close.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressedSupport();
+            }
+        });
+
+
         nesteScrollWebView = findViewById(R.id.nesteScrollWebView);
         pvWeb = findViewById(R.id.pb_web);
         type = getIntent().getIntExtra("type", 0);
@@ -30,7 +30,7 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
         implements MineContract.IMineView, View.OnClickListener {
     LinearLayout childlayout, personinfo, layout_orderDetail, layout_order;
     RoundedImageView user_photo;
-    TextView user_name, user_mobile;
+    TextView user_name, user_mobile,binding_state;
  
     @NonNull
     @Override
@@ -56,6 +56,10 @@ 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);
+        binding_state=view.findViewById(R.id.binding_state);
+        if(AppConfig.ISBINDING){
+            binding_state.setText("");
+        }
  
     }
  
@@ -25,10 +25,14 @@ import com.shunzhi.parent.R;
 import com.shunzhi.parent.adapter.MyConsultAdapter;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.MyConsultBean;
+import com.shunzhi.parent.bean.channel.ChannelBean;
+import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
 import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter;
+import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
+import com.shunzhi.parent.util.AttrsUtils;
+import com.shunzhi.parent.views.TextAndImgShowView;
  
-import java.util.ArrayList;
 import java.util.List;
  
 public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneContract.ConsultOnePresenter,
@@ -77,30 +81,31 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
  
         layout_control = view.findViewById(R.id.layout_control);
         layout_control.measure(0, 0);
-        mPresenter.getTools(layout_control);
+//        mPresenter.getTools(layout_control);
         recyclerViewGrally = view.findViewById(R.id.recyclerViewGrally);
         recyclerViewConsultOne = view.findViewById(R.id.recyclerViewConsultOne);
  
-        mPresenter.getBanners("3","杭州");
-        initRecyclerViewConsult();
+        mPresenter.getBanners("3","余杭");
+        mPresenter.getConsultContent("余杭区", 42, 0, 1);
+//        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);
-
-    }
+//    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);
+//
+//    }
  
     @NonNull
     @Override
@@ -126,8 +131,33 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
     }
  
     @Override
-    public void showConsultContent() {
+    public void showConsultContent(List<ChannelContextBean> list) {
+//        contextList.clear();
+//        contextList.addAll(list);
+        if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
+        myConsultAdapter.addAll(list);
+        recyclerViewConsultOne.setAdapter(myConsultAdapter);
+    }
  
+    @Override
+    public void showChannel(List<ChannelBean> list) {
+        for (int i = 0; i < list.size(); i++) {
+            TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity());
+            textAndImgShowView.setTextColor(R.color.textColor);
+            textAndImgShowView.setText(list.get(i).getChannelName());
+//            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);
+        }
     }
  
     private class MyGrallyAdapter extends BaseRecyclerViewAdapter<GuangGaoBean> {
@@ -165,7 +195,6 @@ 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+"");
             }
         }
 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.view.View;
-import android.view.ViewGroup;
 import android.widget.TextView;
  
 import com.share.mvpsdk.base.BasePresenter;
@@ -18,6 +13,8 @@ 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;
  
@@ -50,23 +47,23 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
  
         recyclerView = view.findViewById(R.id.recyclerView);
  
-        initRecyclerView();
+//        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);
-    }
+//    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);
+//    }
  
     @NonNull
     @Override
@@ -84,11 +81,16 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
  
     }
  
-    /**
-     * 显示咨询内容
-     */
     @Override
-    public void showConsultContent() {
+    public void showConsultContent(List<ChannelContextBean> list) {
+
+    }
+
+    @Override
+    public void showChannel(List<ChannelBean> list) {
  
     }
+
+
+
 }
@@ -16,11 +16,11 @@
         >
         <TextView
             android:id="@+id/close_btn"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
             android:layout_marginLeft="10dp"
             android:layout_centerVertical="true"
-            android:background="@drawable/close"
+            android:background="@drawable/arrow_left"
             />
         <TextView
             android:id="@+id/title_web"
@@ -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"
@@ -7,8 +7,8 @@
  
     <TextView
         android:id="@+id/back_top"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
         android:layout_gravity="center_vertical"
         android:background="@drawable/arrow_left" />
...	...	@@ -22,7 +22,10 @@ public class AppConfig {
22	22	public static String USER_SEX = "user_sex";
23	23	public static String USER_IMAGE = "user_image";
24	24	public static String PARENT_ID = "parent_id";
	25	+
	26	+
25	27	public static boolean ISLOGIN = false;
	28	+ public static boolean ISBINDING = false;
26	29
27	30	public static int BINDING_SUCCESS_HEZUO = 1;
28	31	public static int BINDING_SUCCESS_NOT = 2;
...	...
...	...	@@ -12,14 +12,13 @@ import android.widget.TextView;
12	12	import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
13	13	import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
14	14	import com.shunzhi.parent.R;
15		-import com.shunzhi.parent.bean.MyConsultBean;
16		-import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;
	15	+import com.shunzhi.parent.bean.channel.ChannelContextBean;
17	16
18	17	/**
19	18	* Created by ToaHanDong on 2018/3/14.
20	19	*/
21	20
22		-public class MyConsultAdapter extends BaseRecyclerViewAdapter<MyConsultBean> {
	21	+public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean> {
23	22
24	23	private Context mContext=null;
25	24
...	...	@@ -41,7 +40,7 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<MyConsultBean> {
41	40	return new MyConsultViewHolder(view);
42	41	}
43	42
44		- private class MyConsultViewHolder extends BaseRecyclerViewHolder<MyConsultBean>{
	43	+ private class MyConsultViewHolder extends BaseRecyclerViewHolder<ChannelContextBean>{
45	44
46	45	TextView tvConsultTitle, tvConsultContent, tvPingLunNums, tvZhuanFaNums;
47	46	ImageView iv_consult;
...	...	@@ -55,11 +54,11 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<MyConsultBean> {
55	54	}
56	55
57	56	@Override
58		- public void onBindViewHolder(MyConsultBean object, int position) {
59		- tvConsultContent.setText(object.consultContent);
60		- tvConsultTitle.setText(object.consultTitle);
61		- tvPingLunNums.setText(object.consultCounts);
62		- tvZhuanFaNums.setText(object.consultZhuanfaCounts);
	57	+ public void onBindViewHolder(ChannelContextBean object, int position) {
	58	+ tvConsultContent.setText(object.getContent());
	59	+ tvConsultTitle.setText(object.getTitle());
	60	+// tvPingLunNums.setText(object.getForwardingNum());
	61	+// tvZhuanFaNums.setText(object.getTalkNum());
63	62	}
64	63	}
65	64	}
...	...
...	...	@@ -7,6 +7,8 @@ import com.share.mvpsdk.base.BasePresenter;
7	7	import com.share.mvpsdk.base.IBaseFragment;
8	8	import com.share.mvpsdk.base.IBaseModel;
9	9	import com.shunzhi.parent.bean.GuangGaoBean;
	10	+import com.shunzhi.parent.bean.channel.ChannelBean;
	11	+import com.shunzhi.parent.bean.channel.ChannelContextBean;
10	12
11	13	import java.util.List;
12	14
...	...	@@ -39,7 +41,9 @@ public interface ConsultOneContract {
39	41
40	42	void showBanners(List<GuangGaoBean> guangGaoBeanList);
41	43
42		- void showConsultContent();
	44	+ void showConsultContent(List<ChannelContextBean> list);
	45	+
	46	+ void showChannel(List<ChannelBean> list);
43	47
44	48
45	49	}
...	...
...	...	@@ -6,7 +6,6 @@ import com.share.mvpsdk.helper.RetrofitCreateHelper;
6	6	import com.share.mvpsdk.helper.RxHelper;
7	7	import com.shunzhi.parent.AppConfig;
8	8	import com.shunzhi.parent.api.Consult;
9		-import com.shunzhi.parent.bean.GuangGaoBean;
10	9	import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
11	10
12	11	import io.reactivex.Observable;
...	...	@@ -35,6 +34,9 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo
35	34	@Override
36	35	public Observable<JsonObject> getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex) {
37	36	return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
38		- .getConsultContent(areaName,channel,toFirstPage,pageIndex);
	37	+ .getConsultContent(areaName,channel,toFirstPage,pageIndex).compose(RxHelper.<JsonObject>rxSchedulerHelper());
39	38	}
	39	+
	40	+
	41	+
40	42	}
...	...
1	1	package com.shunzhi.parent.presenter.consult.consultone;
2	2
	3	+import android.util.Log;
3	4	import android.view.View;
4	5	import android.widget.LinearLayout;
5	6
6	7	import com.google.gson.Gson;
7	8	import com.google.gson.JsonArray;
8	9	import com.google.gson.JsonObject;
	10	+import com.share.mvpsdk.utils.OkHttpExceptionUtil;
9	11	import com.share.mvpsdk.utils.ToastUtils;
10	12	import com.shunzhi.parent.R;
11	13	import com.shunzhi.parent.bean.GuangGaoBean;
12	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	18	import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
14	19	import com.shunzhi.parent.model.consult.consultone.ConsultOneModel;
15	20	import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;
...	...	@@ -20,6 +25,7 @@ import java.util.ArrayList;
20	25	import java.util.List;
21	26
22	27	import io.reactivex.functions.Consumer;
	28	+import retrofit2.HttpException;
23	29
24	30	/**
25	31	* Created by ToaHanDong on 2018/3/14.
...	...	@@ -80,6 +86,26 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
80	86
81	87	@Override
82	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	+ ToastUtils.showToast(jsonObject.toString());
	93	+ JsonObject json=jsonObject.getAsJsonObject("data");
	94	+ Gson g=new Gson();
	95	+ ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class);
	96	+ Log.e("ssss-===",channelInfo.toString());
	97	+ List<ChannelContextBean> contextList = channelInfo.getChannelContent();
	98	+ List<ChannelBean> channelList = channelInfo.getSubchannel();
	99	+ mIView.showChannel(channelList);
	100	+ mIView.showConsultContent(contextList);
	101	+ }
	102	+ }, new Consumer<Throwable>() {
	103	+ @Override
	104	+ public void accept(Throwable throwable) throws Exception {
	105	+ OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
	106	+ }
	107	+ }));
	108	+
83	109
84	110	}
85	111
...	...
...	...	@@ -139,6 +139,9 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
139	139	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(currentBean.getSex()));
140	140	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.PARENT_ID, String.valueOf(currentBean.getParentId()));
141	141	AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID, currentBean.getUserid());
	142	+ if (currentBean.getStudentClass() != null && currentBean.getStudentClass().size() > 0) {
	143	+ AppConfig.ISBINDING = true;
	144	+ }
142	145	mIView.getUserInfo(0);
143	146
144	147	} else {
...	...
...	...	@@ -46,6 +46,14 @@ public class WebViewActivity extends BaseCompatActivity {
46	46	zuoye = findViewById(R.id.zuoye);
47	47	title_web = findViewById(R.id.title_web);
48	48
	49	+ close.setOnClickListener(new View.OnClickListener() {
	50	+ @Override
	51	+ public void onClick(View v) {
	52	+ onBackPressedSupport();
	53	+ }
	54	+ });
	55	+
	56	+
49	57	nesteScrollWebView = findViewById(R.id.nesteScrollWebView);
50	58	pvWeb = findViewById(R.id.pb_web);
51	59	type = getIntent().getIntExtra("type", 0);
...	...
...	...	@@ -30,7 +30,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
30	30	implements MineContract.IMineView, View.OnClickListener {
31	31	LinearLayout childlayout, personinfo, layout_orderDetail, layout_order;
32	32	RoundedImageView user_photo;
33		- TextView user_name, user_mobile;
	33	+ TextView user_name, user_mobile,binding_state;
34	34
35	35	@NonNull
36	36	@Override
...	...	@@ -56,6 +56,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
56	56	user_photo = view.findViewById(R.id.user_photo);
57	57	user_name = view.findViewById(R.id.user_name);
58	58	user_mobile = view.findViewById(R.id.user_mobile);
	59	+ binding_state=view.findViewById(R.id.binding_state);
	60	+ if(AppConfig.ISBINDING){
	61	+ binding_state.setText("");
	62	+ }
59	63
60	64	}
61	65
...	...
...	...	@@ -25,10 +25,14 @@ import com.shunzhi.parent.R;
25	25	import com.shunzhi.parent.adapter.MyConsultAdapter;
26	26	import com.shunzhi.parent.bean.GuangGaoBean;
27	27	import com.shunzhi.parent.bean.MyConsultBean;
	28	+import com.shunzhi.parent.bean.channel.ChannelBean;
	29	+import com.shunzhi.parent.bean.channel.ChannelContextBean;
28	30	import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
29	31	import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter;
	32	+import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
	33	+import com.shunzhi.parent.util.AttrsUtils;
	34	+import com.shunzhi.parent.views.TextAndImgShowView;
30	35
31		-import java.util.ArrayList;
32	36	import java.util.List;
33	37
34	38	public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneContract.ConsultOnePresenter,
...	...	@@ -77,30 +81,31 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
77	81
78	82	layout_control = view.findViewById(R.id.layout_control);
79	83	layout_control.measure(0, 0);
80		- mPresenter.getTools(layout_control);
	84	+// mPresenter.getTools(layout_control);
81	85	recyclerViewGrally = view.findViewById(R.id.recyclerViewGrally);
82	86	recyclerViewConsultOne = view.findViewById(R.id.recyclerViewConsultOne);
83	87
84		- mPresenter.getBanners("3","杭州");
85		- initRecyclerViewConsult();
	88	+ mPresenter.getBanners("3","余杭");
	89	+ mPresenter.getConsultContent("余杭区", 42, 0, 1);
	90	+// initRecyclerViewConsult();
86	91	}
87	92
88		- private void initRecyclerViewConsult() {
89		- if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
90		- if (null == myConsultBeanList) myConsultBeanList = new ArrayList<>();
91		- else myConsultBeanList.clear();
92		- for (int i = 0; i < 12; i++) {
93		- MyConsultBean myConsultBean = new MyConsultBean();
94		- myConsultBean.consultCounts = i + "";
95		- myConsultBean.consultContent = "咨询内容" + i;
96		- myConsultBean.consultTitle = "咨询标题" + i;
97		- myConsultBean.consultZhuanfaCounts = "转发:" + i;
98		- myConsultBeanList.add(myConsultBean);
99		- }
100		- myConsultAdapter.addAll(myConsultBeanList);
101		- recyclerViewConsultOne.setAdapter(myConsultAdapter);
102		-
103		- }
	93	+// private void initRecyclerViewConsult() {
	94	+// if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
	95	+// if (null == myConsultBeanList) myConsultBeanList = new ArrayList<>();
	96	+// else myConsultBeanList.clear();
	97	+// for (int i = 0; i < 12; i++) {
	98	+// MyConsultBean myConsultBean = new MyConsultBean();
	99	+// myConsultBean.consultCounts = i + "";
	100	+// myConsultBean.consultContent = "咨询内容" + i;
	101	+// myConsultBean.consultTitle = "咨询标题" + i;
	102	+// myConsultBean.consultZhuanfaCounts = "转发:" + i;
	103	+// myConsultBeanList.add(myConsultBean);
	104	+// }
	105	+// myConsultAdapter.addAll(myConsultBeanList);
	106	+// recyclerViewConsultOne.setAdapter(myConsultAdapter);
	107	+//
	108	+// }
104	109
105	110	@NonNull
106	111	@Override
...	...	@@ -126,8 +131,33 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
126	131	}
127	132
128	133	@Override
129		- public void showConsultContent() {
	134	+ public void showConsultContent(List<ChannelContextBean> list) {
	135	+// contextList.clear();
	136	+// contextList.addAll(list);
	137	+ if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
	138	+ myConsultAdapter.addAll(list);
	139	+ recyclerViewConsultOne.setAdapter(myConsultAdapter);
	140	+ }
130	141
	142	+ @Override
	143	+ public void showChannel(List<ChannelBean> list) {
	144	+ for (int i = 0; i < list.size(); i++) {
	145	+ TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity());
	146	+ textAndImgShowView.setTextColor(R.color.textColor);
	147	+ textAndImgShowView.setText(list.get(i).getChannelName());
	148	+// textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage()));
	149	+ textAndImgShowView.addImgs(list.get(i).getChannelImage());
	150	+ textAndImgShowView.setSelect(true);
	151	+ textAndImgShowView.setWidth(getActivity(), layout_control);
	152	+ textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0));
	153	+ textAndImgShowView.setOnClickListener(new View.OnClickListener() {
	154	+ @Override
	155	+ public void onClick(View view) {
	156	+ ConsultOneLevelActivity.getInstance(getActivity());
	157	+ }
	158	+ });
	159	+ layout_control.addView(textAndImgShowView);
	160	+ }
131	161	}
132	162
133	163	private class MyGrallyAdapter extends BaseRecyclerViewAdapter<GuangGaoBean> {
...	...	@@ -165,7 +195,6 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
165	195	@Override
166	196	public void onBindViewHolder(GuangGaoBean object, int position) {
167	197	Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG+object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
168		-// iv_grally.setImageResource(R.drawable.ic_launcher_background);
169	198	tv_grally_title.setText(object.describe+"");
170	199	}
171	200	}
...	...
1	1	package com.shunzhi.parent.ui.fragment.consult;
2	2
3		-import android.content.Context;
4		-import android.net.Uri;
5	3	import android.os.Bundle;
6	4	import android.support.annotation.NonNull;
7	5	import android.support.annotation.Nullable;
8		-import android.support.v4.app.Fragment;
9	6	import android.support.v7.widget.RecyclerView;
10		-import android.view.LayoutInflater;
11	7	import android.view.View;
12		-import android.view.ViewGroup;
13	8	import android.widget.TextView;
14	9
15	10	import com.share.mvpsdk.base.BasePresenter;
...	...	@@ -18,6 +13,8 @@ import com.shunzhi.parent.R;
18	13	import com.shunzhi.parent.adapter.MyConsultAdapter;
19	14	import com.shunzhi.parent.bean.GuangGaoBean;
20	15	import com.shunzhi.parent.bean.MyConsultBean;
	16	+import com.shunzhi.parent.bean.channel.ChannelBean;
	17	+import com.shunzhi.parent.bean.channel.ChannelContextBean;
21	18	import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
22	19	import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter;
23	20
...	...	@@ -50,23 +47,23 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
50	47
51	48	recyclerView = view.findViewById(R.id.recyclerView);
52	49
53		- initRecyclerView();
	50	+// initRecyclerView();
54	51	}
55	52
56		- private void initRecyclerView() {
57		-
58		- if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
59		- for (int i = 0; i < 12; i++) {
60		- MyConsultBean myConsultBean = new MyConsultBean();
61		- myConsultBean.consultCounts = i + "";
62		- myConsultBean.consultContent = "咨询内容" + i;
63		- myConsultBean.consultTitle = "咨询标题" + i;
64		- myConsultBean.consultZhuanfaCounts = "转发:" + i;
65		- myConsultBeanList.add(myConsultBean);
66		- }
67		- myConsultAdapter.addAll(myConsultBeanList);
68		- recyclerView.setAdapter(myConsultAdapter);
69		- }
	53	+// private void initRecyclerView() {
	54	+//
	55	+// if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
	56	+// for (int i = 0; i < 12; i++) {
	57	+// MyConsultBean myConsultBean = new MyConsultBean();
	58	+// myConsultBean.consultCounts = i + "";
	59	+// myConsultBean.consultContent = "咨询内容" + i;
	60	+// myConsultBean.consultTitle = "咨询标题" + i;
	61	+// myConsultBean.consultZhuanfaCounts = "转发:" + i;
	62	+// myConsultBeanList.add(myConsultBean);
	63	+// }
	64	+// myConsultAdapter.addAll(myConsultBeanList);
	65	+// recyclerView.setAdapter(myConsultAdapter);
	66	+// }
70	67
71	68	@NonNull
72	69	@Override
...	...	@@ -84,11 +81,16 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
84	81
85	82	}
86	83
87		- /**
88		- * 显示咨询内容
89		- */
90	84	@Override
91		- public void showConsultContent() {
	85	+ public void showConsultContent(List<ChannelContextBean> list) {
	86	+
	87	+ }
	88	+
	89	+ @Override
	90	+ public void showChannel(List<ChannelBean> list) {
92	91
93	92	}
	93	+
	94	+
	95	+
94	96	}
...	...