From 432b4257fabd5492350c9007ec4674ee9b6aac47 Mon Sep 17 00:00:00 2001 From: 陶汉栋 <2821744554@qq.com> Date: Thu, 22 Mar 2018 15:36:10 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java | 4 ++++ app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java | 6 ++++++ app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java | 25 +++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java | 17 +++++++++++------ app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java | 2 +- app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 10 +++++++++- app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 67 ++++++++++++++++++++++++++++++++++++++----------------------------- app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java | 10 +++++++++- app/src/main/res/layout/layout_consult_content.xml | 2 +- app/src/main/res/layout/text_and_img_show.xml | 4 ++-- app/src/main/res/values/colors.xml | 4 ++-- 11 files changed, 108 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java index d252812..658e0e5 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java @@ -26,6 +26,8 @@ public interface ConsultContract { public abstract void getBanners(String position, String areaName); public abstract void getContextChannel(String areaName, int channel, int toFirstPage, int pageIndex); + + public abstract void getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex); } @@ -35,6 +37,8 @@ public interface ConsultContract { Observable getBanners(String position, String areaName); Observable getContextChannel(String areaName, int channel, int toFirstPage, int pageIndex); + + Observable getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex); } interface IConsultView extends IBaseFragment { diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java index cf20faf..dacaa7c 100644 --- a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java @@ -34,6 +34,12 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM .compose(RxHelper.rxSchedulerHelper()); } + @Override + public Observable 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.rxSchedulerHelper()); + } + public static ConsultContract.IConsultModel newInstance() { return new ConsultModel(); } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java index 651ac79..d2dd7c0 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java @@ -1,5 +1,6 @@ package com.shunzhi.parent.presenter.consult; +import android.util.Log; import android.view.View; import android.widget.LinearLayout; @@ -108,6 +109,30 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { } @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() { + @Override + public void accept(JsonObject jsonObject) throws Exception { + JsonObject json=jsonObject.getAsJsonObject("data"); + Gson g=new Gson(); + List channelList = new ArrayList<>(); + JsonArray jsonArray=json.getAsJsonArray("channelList"); + for (int i = 0; i < jsonArray.size(); i++) { + ChannelContextBean channelBean=g.fromJson(jsonArray.get(i),ChannelContextBean.class); + channelList.add(channelBean); + } + mIView.showContext(channelList); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { +// Log.d("66666","getInformationTopic="+throwable); + OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); + } + })); + } + + @Override public ConsultContract.IConsultModel getModel() { return ConsultModel.newInstance(); } 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 40eeeeb..2c0e963 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 @@ -101,6 +101,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { +// Log.d("66666","getConsultContent="+throwable); OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); } })); @@ -113,18 +114,22 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ mRxManager.register(mIModel.getInformationTopic(keyword,areaName,channel,toFirstPage,pageIndex).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { + Log.d("66666","getInformationTopic="+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); + List channelList = new ArrayList<>(); + JsonArray jsonArray=json.getAsJsonArray("channelList"); + for (int i = 0; i < jsonArray.size(); i++) { + ChannelContextBean channelBean=g.fromJson(jsonArray.get(i),ChannelContextBean.class); + channelList.add(channelBean); + } + Log.d("66666","channelList="+channelList.toString()); + mIView.showConsultContent(channelList); } }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { +// Log.d("66666","getInformationTopic="+throwable); OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); } })); diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java index 6c9b7f6..e1282f2 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java @@ -88,7 +88,7 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi back(); break; case R.id.ivSearch: - + consultTwoLevelFragment.showSearch(et_search.getText().toString()); break; } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index f4ce880..7e5da96 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -8,7 +8,9 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; +import android.text.TextUtils; import android.view.View; +import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -63,6 +65,8 @@ public class ConsultFragment extends BaseMVPCompatFragment list) { - myConsultBeanList.addAll(list); - if (myConsultAdapter == null) { - myConsultAdapter = new MyConsultAdapter(getActivity()); - myConsultAdapter.addAll(myConsultBeanList); - recyclerViewConsultOne.setAdapter(myConsultAdapter); - } else { - myConsultAdapter.addAll(myConsultBeanList); - myConsultAdapter.notifyDataSetChanged(); - } +// Log.d("66666", "ChannelContextBean=" + list); + if (null != list) { + myConsultBeanList.addAll(list); + if (myConsultAdapter == null) { + myConsultAdapter = new MyConsultAdapter(getActivity()); + myConsultAdapter.addAll(myConsultBeanList); + recyclerViewConsultOne.setAdapter(myConsultAdapter); + } else { + myConsultAdapter.addAll(myConsultBeanList); + myConsultAdapter.notifyDataSetChanged(); + } + }else ToastUtils.showToast("没有数据"); } @Override public void showChannel(List 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); + if (null != 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); + } } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java index d113e2a..04406ee 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; +import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -90,7 +91,6 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment list) { - myConsultBeanList.clear(); myConsultBeanList.addAll(list); if (myConsultAdapter == null) myConsultAdapter = new MyConsultAdapter(getActivity()); if (null == recyclerView.getAdapter()) recyclerView.setAdapter(myConsultAdapter); @@ -108,4 +108,12 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b74abc3..6d1f1b9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,9 +9,9 @@ #B8B8B9 #F0EFF5 #FC5B6A - #C6DAFF + #A6DAFF #ACC9FC - #C6DAFF + #A6DAFF #F0EFF5 #494947 #ABC9FF -- libgit2 0.21.0