From 9e6ee8e8ff5c0d221587b152e0d0193df4679eb0 Mon Sep 17 00:00:00 2001 From: 陶汉栋 <2821744554@qq.com> Date: Tue, 20 Mar 2018 11:23:21 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java | 44 ++++++++++++++++++++++++-------------------- app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java | 4 ++++ app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java | 24 +++++++++++++++++++++++- app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java | 4 ++-- app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java | 20 +++++++++++++++++++- app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 5 ++--- app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 6 +++--- app/src/main/res/layout/activity_mychild.xml | 1 - 8 files changed, 77 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java index 811fad8..bb8be66 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java @@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter { @Override public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, null); + View view = LayoutInflater.from(context).inflate(R.layout.activity_web_view, null); return new MyViewHolder(view); } @@ -53,25 +53,29 @@ public class ChildAdapter extends BaseRecyclerViewAdapter { @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)); - } - }); - - 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); - } - }); + 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(); + } } } 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 12cdd0a..7b1e6ca 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 @@ -26,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{ @@ -34,6 +36,8 @@ public interface ConsultOneContract { Observable getBanners(String position,String areaName); Observable getConsultContent(String areaName, int channel, int toFirstPage, int pageIndex); + + Observable getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex); } interface IConsultOneView extends IBaseFragment{ 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 9c6a9d8..3f4379c 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 @@ -93,7 +93,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ JsonObject json=jsonObject.getAsJsonObject("data"); Gson g=new Gson(); ChannelInfo channelInfo = g.fromJson(json.toString(),ChannelInfo.class); - Log.e("ssss-===",channelInfo.toString()); +// Log.e("ssss-===",channelInfo.toString()); List contextList = channelInfo.getChannelContent(); List channelList = channelInfo.getSubchannel(); mIView.showChannel(channelList); @@ -109,6 +109,28 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ } + @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(); + 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); + } + })); + } + @Override public ConsultOneContract.IConsultOneModel getModel() { 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 27175cb..3af3fca 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 @@ -27,8 +27,8 @@ public class WebViewActivity extends BaseCompatActivity { NestedScrollWebView nesteScrollWebView; LinearLayout binding_success, binding_success2; -// ImageView close; - TextView tv_info,zuoye,title_web,close_btn; + ImageView close_btn; + TextView tv_info,zuoye,title_web; int type; diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java index 54ea630..1f189ae 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java @@ -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 guangGaoBeanList) { - Log.d("6666","imgesUrl="+guangGaoBeanList); initRecyclerView(guangGaoBeanList); } diff --git a/app/src/main/res/layout/activity_mychild.xml b/app/src/main/res/layout/activity_mychild.xml index 756224f..c9420af 100644 --- a/app/src/main/res/layout/activity_mychild.xml +++ b/app/src/main/res/layout/activity_mychild.xml @@ -28,7 +28,6 @@ android:layout_marginBottom="@dimen/size_dp_10" android:gravity="center" android:background="@drawable/rudiobtn" - android:layout_marginBottom="10dp" /> -- libgit2 0.21.0