From afec02d6efb5af42afcf20c1178ac19a8a17b3d7 Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Wed, 4 Apr 2018 15:19:23 +0800 Subject: [PATCH] no message --- .idea/modules.xml | 2 +- app/libs/processor.jar | Bin 5681 -> 0 bytes app/src/main/java/com/shunzhi/parent/api/ReportApi.java | 6 +++++- app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java | 4 ++-- app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java | 4 ++-- app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java | 7 ++----- app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.idea/modules.xml b/.idea/modules.xml index 1e51467..62d4a46 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,8 +4,8 @@ - + diff --git a/app/libs/processor.jar b/app/libs/processor.jar index 279fe2c..181873a 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ 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 37bd7d1..4068b57 100644 --- a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java @@ -12,5 +12,9 @@ import retrofit2.http.Query; public interface ReportApi { @GET("/api/EvaluationLabel/GetSceneAnalysisDetails") - Observable getSceneDetial(@Query("ObjectId") String ObjectId, @Query("SchoolId") int SchoolId, @Query("ObjectType") int ObjectType); + Observable getSceneDetial(@Query("ObjectId") String ObjectId, + @Query("SchoolId") int SchoolId, + @Query("ObjectType") int ObjectTypev, + @Query("startDate") String startDate, + @Query("endDate") String endDate); } diff --git a/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java b/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java index c800aa9..f6bff90 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java @@ -16,10 +16,10 @@ import io.reactivex.Observable; public interface ReportSceneContract { abstract class ReportScenePresenter extends BasePresenter{ - public abstract void reportSceneResult(String objectId,int schoolId,int objectType); + public abstract void reportSceneResult(String objectId,int schoolId,int objectType,String startDate,String endDate); } interface IReportSceneModel extends IBaseModel { - Observable getReportSceneResult(String objectId, int schoolId, int objectType); + Observable getReportSceneResult(String objectId, int schoolId, int objectType,String startDate,String endDate); } interface IReportSceneView extends IBaseView { void showSceneList(List list); diff --git a/app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java b/app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java index fe1ba40..3dfe24d 100644 --- a/app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java @@ -19,8 +19,8 @@ public class ReportSceneModel implements ReportSceneContract.IReportSceneModel { return new ReportSceneModel(); } @Override - public Observable getReportSceneResult(String ObjectId, int schoolId, int objectType) { + public Observable getReportSceneResult(String ObjectId, int schoolId, int objectType,String startDate,String endDate) { return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL) - .getSceneDetial(ObjectId,schoolId,objectType).compose(RxHelper.rxSchedulerHelper()); + .getSceneDetial(ObjectId,schoolId,objectType,startDate,endDate).compose(RxHelper.rxSchedulerHelper()); } } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java index c44a7f0..4e16a82 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java @@ -1,8 +1,6 @@ package com.shunzhi.parent.presenter.report; -import android.util.Log; - import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -33,8 +31,8 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent } @Override - public void reportSceneResult(String objectId, int schoolId, int objectType) { - mRxManager.register(mIModel.getReportSceneResult(objectId, schoolId, objectType).subscribe(new Consumer() { + public void reportSceneResult(String objectId, int schoolId, int objectType,String startDate,String endDate) { + mRxManager.register(mIModel.getReportSceneResult(objectId, schoolId, objectType,startDate,endDate).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { ToastUtils.showToast(jsonObject.toString()); @@ -47,7 +45,6 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent Gson g = new Gson(); List list = new ArrayList<>(); Iterator it = behaviorArray.iterator(); //Iterator处理 - int i=0; while (it.hasNext()) { //循环 SceneDetialBean bean = g.fromJson(it.next().toString(), SceneDetialBean.class); //String转化成JavaBean list.add(bean); //加入list diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java index 9fdc79f..f2ddeae 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java @@ -34,6 +34,8 @@ public class ReportSceneFragment extends BaseMVPCompatFragment