From df3a9c116c99388844521fef257611214c1e33bd Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Wed, 4 Apr 2018 21:43:07 +0800 Subject: [PATCH] no message --- app/src/main/assets/migrations/3.sql | 3 --- app/src/main/java/com/shunzhi/parent/api/ReportApi.java | 19 +++++++++++-------- 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 | 4 ++-- app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 app/src/main/assets/migrations/3.sql diff --git a/app/src/main/assets/migrations/3.sql b/app/src/main/assets/migrations/3.sql deleted file mode 100644 index 24d224b..0000000 --- a/app/src/main/assets/migrations/3.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER table test ADD COLUMN age INTEGER -ALTER table test ADD COLUMN area INTEGER -ALTER table test ADD COLUMN name TEXT 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 4068b57..e136800 100644 --- a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java @@ -3,18 +3,21 @@ package com.shunzhi.parent.api; import com.google.gson.JsonObject; import io.reactivex.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; /** * Created by Administrator on 2018/4/3 0003. */ public interface ReportApi { - @GET("/api/EvaluationLabel/GetSceneAnalysisDetails") - Observable getSceneDetial(@Query("ObjectId") String ObjectId, - @Query("SchoolId") int SchoolId, - @Query("ObjectType") int ObjectTypev, - @Query("startDate") String startDate, - @Query("endDate") String endDate); + @FormUrlEncoded + @POST("/api/EvaluationLabel/GetSceneAnalysisDetails") + Observable getSceneDetial(@Field("screenId") int screenId, + @Field("ObjectId") String ObjectId, + @Field("SchoolId") int SchoolId, + @Field("ObjectType") int ObjectTypev, + @Field("startDate") String startDate, + @Field("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 f6bff90..ce90d99 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,String startDate,String endDate); + public abstract void reportSceneResult(int screenId,String objectId,int schoolId,int objectType,String startDate,String endDate); } interface IReportSceneModel extends IBaseModel { - Observable getReportSceneResult(String objectId, int schoolId, int objectType,String startDate,String endDate); + Observable getReportSceneResult(int screenId,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 3dfe24d..ee448c8 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,String startDate,String endDate) { + public Observable getReportSceneResult(int screenId,String ObjectId, int schoolId, int objectType,String startDate,String endDate) { return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL) - .getSceneDetial(ObjectId,schoolId,objectType,startDate,endDate).compose(RxHelper.rxSchedulerHelper()); + .getSceneDetial(screenId,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 4e16a82..dd0faaa 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 @@ -31,8 +31,8 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent } @Override - 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() { + public void reportSceneResult(int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate) { + mRxManager.register(mIModel.getReportSceneResult(screenId,objectId, schoolId, objectType,startDate,endDate).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { ToastUtils.showToast(jsonObject.toString()); 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 f2ddeae..9b8d67a 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,7 +34,7 @@ public class ReportSceneFragment extends BaseMVPCompatFragment