From 07503a80eb01505baca0be98d753e03a1878302c Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Sun, 8 Apr 2018 10:35:11 +0800 Subject: [PATCH] no message --- .idea/modules.xml | 4 ++-- app/src/main/java/com/shunzhi/parent/api/ReportApi.java | 14 ++++++++++++-- app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java | 4 ++-- app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java | 27 +++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java | 19 ++++++++++++++++--- 6 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java create mode 100644 app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java diff --git a/.idea/modules.xml b/.idea/modules.xml index 64d4818..9c7f509 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,9 +4,9 @@ - - + + diff --git a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java index e136800..7ed2cf7 100644 --- a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java @@ -13,11 +13,21 @@ import retrofit2.http.POST; public interface ReportApi { @FormUrlEncoded - @POST("/api/EvaluationLabel/GetSceneAnalysisDetails") + @POST("api/EvaluationLabel/GetSceneAnalysisDetails") Observable getSceneDetial(@Field("screenId") int screenId, @Field("ObjectId") String ObjectId, @Field("SchoolId") int SchoolId, - @Field("ObjectType") int ObjectTypev, + @Field("ObjectType") int ObjectType, + @Field("startDate") String startDate, + @Field("endDate") String endDate); + + + @FormUrlEncoded + @POST("api/EvaluationStatistics/GetStatisticalAnalysis") + Observable getReportDetial(@Field("screenId") int screenId, + @Field("ObjectId") String ObjectId, + @Field("SchoolId") int SchoolId, + @Field("ObjectType") int ObjectType, @Field("startDate") String startDate, @Field("endDate") String endDate); } diff --git a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java index 6ccf336..287afed 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java @@ -4,7 +4,7 @@ import com.google.gson.JsonObject; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.IBaseModel; import com.share.mvpsdk.base.IBaseView; -import com.shunzhi.parent.bean.report.SceneDetialBean; +import com.shunzhi.parent.bean.report.DeyuDetialBean; import java.util.List; @@ -22,7 +22,7 @@ public interface ReportDetialContract { Observable getReportDetialResult(int screenId, String objectId, int schoolId, int objectType, String startDate, String endDate); } interface IReportDetialView extends IBaseView { - void showDetialList(List list); + void showDetialList(List list); void showDetialInfo(String rank, String scoree, String pscoree, String sceneName); } diff --git a/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java b/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java new file mode 100644 index 0000000..effae0a --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java @@ -0,0 +1,27 @@ +package com.shunzhi.parent.model.report; + +import com.google.gson.JsonObject; +import com.share.mvpsdk.helper.RetrofitCreateHelper; +import com.share.mvpsdk.helper.RxHelper; +import com.shunzhi.parent.AppConfig; +import com.shunzhi.parent.api.ReportApi; +import com.shunzhi.parent.contract.report.ReportDetialContract; + +import io.reactivex.Observable; + +/** + * Created by Administrator on 2018/4/8 0008. + */ + +public class ReportDetialModel implements ReportDetialContract.IReportDetialModel { + + public static ReportDetialModel newInstance(){ + return new ReportDetialModel(); + } + + @Override + public Observable getReportDetialResult(int screenId, String objectId, int schoolId, int objectType, String startDate, String endDate) { + return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL).getReportDetial(screenId,objectId,schoolId,objectType + ,startDate,endDate).compose(RxHelper.rxSchedulerHelper()); + } +} diff --git a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java new file mode 100644 index 0000000..d6b52db --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java @@ -0,0 +1,60 @@ +package com.shunzhi.parent.presenter.report; + +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.share.mvpsdk.utils.ToastUtils; +import com.shunzhi.parent.bean.report.DeyuDetialBean; +import com.shunzhi.parent.contract.report.ReportDetialContract; +import com.shunzhi.parent.model.report.ReportDetialModel; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import io.reactivex.functions.Consumer; + +/** + * Created by Administrator on 2018/4/8 0008. + */ + +public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPresenter { + @Override + public ReportDetialContract.IReportDetialModel getModel() { + return ReportDetialModel.newInstance(); + } + + @Override + public void onStart() { + + } + + @Override + public void reportDetialResult(int screenId, String objectId, int schoolId, int objectType, String startDate, String endDate) { + mRxManager.register(mIModel.getReportDetialResult(screenId, objectId, schoolId, objectType, startDate, endDate).subscribe(new Consumer() { + @Override + public void accept(JsonObject jsonObject) throws Exception { + + ToastUtils.showToast(jsonObject.toString()); + JsonObject data = jsonObject.getAsJsonObject("data"); + JsonArray reportDetialArray = data.getAsJsonArray("result"); + Gson g = new Gson(); + List list = new ArrayList<>(); + Iterator it = reportDetialArray.iterator(); //Iterator处理 + while (it.hasNext()) { //循环 + DeyuDetialBean bean = g.fromJson(it.next().toString(), DeyuDetialBean.class); //String转化成JavaBean + list.add(bean); //加入list + } + mIView.showDetialList(list); + + + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + + } + })); + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java index ce95383..ebec6d1 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java @@ -14,6 +14,9 @@ import com.share.mvpsdk.view.chartview.data.InputData; import com.shunzhi.parent.R; import com.shunzhi.parent.adapter.DeyuDetialAdapter; import com.shunzhi.parent.bean.report.DeyuDetialBean; +import com.shunzhi.parent.bean.report.SceneDetialBean; +import com.shunzhi.parent.contract.report.ReportDetialContract; +import com.shunzhi.parent.presenter.report.ReportDetialPresenter; import java.util.ArrayList; import java.util.List; @@ -22,7 +25,8 @@ import java.util.List; * Created by Administrator on 2018/3/28 0028. */ -public class ReportDetialFragment extends BaseMVPCompatFragment { +public class ReportDetialFragment extends BaseMVPCompatFragment +implements ReportDetialContract.IReportDetialView{ private RecyclerView recycle_deyu; private DeyuDetialAdapter deyuDetialAdapter; @@ -32,7 +36,7 @@ public class ReportDetialFragment extends BaseMVPCompatFragment { @NonNull @Override public BasePresenter initPresenter() { - return null; + return new ReportDetialPresenter(); } @Override @@ -48,7 +52,6 @@ public class ReportDetialFragment extends BaseMVPCompatFragment { deyuDetialAdapter=new DeyuDetialAdapter(getActivity()); deyuDetialAdapter.addAll(list); recycle_deyu.setAdapter(deyuDetialAdapter); - initChartViews(); } @@ -73,4 +76,14 @@ public class ReportDetialFragment extends BaseMVPCompatFragment { chartView.setChartPaths(inputDataList1); } + + @Override + public void showDetialList(List list) { + + } + + @Override + public void showDetialInfo(String rank, String scoree, String pscoree, String sceneName) { + + } } -- libgit2 0.21.0