From e2485424e08d9b6eb6278222d866abec4b0e6def Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Mon, 19 Mar 2018 14:14:35 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/AppConfig.java | 3 +++ app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java | 17 ++++++++--------- app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java | 6 +++++- app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java | 6 ++++-- app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java | 26 ++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 3 +++ app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java | 8 ++++++++ app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java | 6 +++++- app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------- app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java | 50 ++++++++++++++++++++++++++------------------------ app/src/main/res/layout/activity_web_view.xml | 6 +++--- app/src/main/res/layout/fragment_mine.xml | 1 + app/src/main/res/layout/top.xml | 4 ++-- 13 files changed, 145 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index 64b6548..555f695 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -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; diff --git a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java index b4eecf3..d54a4a3 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java @@ -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 { +public class MyConsultAdapter extends BaseRecyclerViewAdapter { private Context mContext=null; @@ -41,7 +40,7 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter { return new MyConsultViewHolder(view); } - private class MyConsultViewHolder extends BaseRecyclerViewHolder{ + private class MyConsultViewHolder extends BaseRecyclerViewHolder{ TextView tvConsultTitle, tvConsultContent, tvPingLunNums, tvZhuanFaNums; ImageView iv_consult; @@ -55,11 +54,11 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter { } @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()); } } } diff --git a/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java b/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java index 79e8ea4..12cdd0a 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java @@ -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 guangGaoBeanList); - void showConsultContent(); + void showConsultContent(List list); + + void showChannel(List list); } diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java index b2c8a99..4c418b6 100644 --- a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java @@ -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 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.rxSchedulerHelper()); } + + + } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java index 5059458..9c6a9d8 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java @@ -1,15 +1,20 @@ 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() { + @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 contextList = channelInfo.getChannelContent(); + List channelList = channelInfo.getSubchannel(); + mIView.showChannel(channelList); + mIView.showConsultContent(contextList); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + } + })); + } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java index 75d1836..f4a93bf 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java @@ -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 { diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java index 92e7cf5..8e3dade 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java @@ -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); diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java index 3a5403b..eab7740 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java @@ -30,7 +30,7 @@ public class MineFragment extends BaseMVPCompatFragment(); - 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 list) { +// contextList.clear(); +// contextList.addAll(list); + if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity()); + myConsultAdapter.addAll(list); + recyclerViewConsultOne.setAdapter(myConsultAdapter); + } + @Override + public void showChannel(List 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 { @@ -165,7 +195,6 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment list) { + + } + + @Override + public void showChannel(List list) { } + + + } diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml index c9b545d..5625c0e 100644 --- a/app/src/main/res/layout/activity_web_view.xml +++ b/app/src/main/res/layout/activity_web_view.xml @@ -16,11 +16,11 @@ > -- libgit2 0.21.0