From 9595d58e4d771d4bbce1a2ff6dbc8f14c81bccd6 Mon Sep 17 00:00:00 2001 From: 姚旭斌 <15805828761@163.com> Date: Sun, 8 Apr 2018 21:58:54 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java | 1 + app/src/main/java/com/shunzhi/parent/api/ReportApi.java | 16 ++++++++-------- app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java | 4 ++-- app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java | 2 +- app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java | 4 ++-- app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java | 20 ++++++++++---------- app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java | 4 ++-- app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java | 1 + app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java | 2 +- app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java | 5 +++-- 10 files changed, 31 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java index 4e92a00..22b26f5 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java @@ -49,6 +49,7 @@ public class DeyuDetialAdapter extends BaseRecyclerViewAdapter { jidian.setText("绩点："+String.format("%.1f", object.getPointScore())+" "+object.getRisePoint()); String pStr=getPaiming(object.getRanking()); paiming.setText("排名："+pStr+" "+object.getRiseRanking()); + pingjia.setText(object.getEvaluationGrade()); itemView.setOnClickListener(new View.OnClickListener() { 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 c2163df..80513fa 100644 --- a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java @@ -14,20 +14,20 @@ import retrofit2.http.POST; public interface ReportApi { @FormUrlEncoded @POST("api/EvaluationLabel/GetSceneAnalysisDetails") - Observable getSceneDetial(@Field("screenId") int screenId, + Observable getSceneDetial(@Field("sceneId") int sceneId, + @Field("screenId") int screenId, @Field("ObjectId") String ObjectId, @Field("SchoolId") int SchoolId, @Field("ObjectType") int ObjectType, @Field("startDate") String startDate, @Field("endDate") String endDate); - @FormUrlEncoded - @POST("/api/EvaluationLabel/GetStatisticalAnalysis") + @POST("api/EvaluationLabel/Getstatisticsanalytical") Observable getReportDetial(@Field("screenId") int screenId, - @Field("schoolId") int SchoolId, -// @Field("ObjectType") int ObjectType, - @Field("classId")String classId, - @Field("startDate") String startDate, - @Field("endDate") String endDate); + @Field("schoolId") int SchoolId, + @Field("objectType") int ObjectType, + @Field("classId") String classId, + @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 ce90d99..e9bd8c5 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(int screenId,String objectId,int schoolId,int objectType,String startDate,String endDate); + public abstract void reportSceneResult(int sceneId,int screenId,String objectId,int schoolId,int objectType,String startDate,String endDate); } interface IReportSceneModel extends IBaseModel { - Observable getReportSceneResult(int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate); + Observable getReportSceneResult(int sceneId,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/ReportDetialModel.java b/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java index 559e78f..ad44813 100644 --- a/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java @@ -21,6 +21,6 @@ public class ReportDetialModel implements ReportDetialContract.IReportDetialMod @Override public Observable getReportDetialResult(int screenId, int schoolId,String classId, int objectType, String startDate, String endDate) { - return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL).getReportDetial(screenId,schoolId,classId,startDate,endDate).compose(RxHelper.rxSchedulerHelper()); + return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL).getReportDetial(screenId,schoolId,objectType,classId,startDate,endDate).compose(RxHelper.rxSchedulerHelper()); } } 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 ee448c8..47f0099 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(int screenId,String ObjectId, int schoolId, int objectType,String startDate,String endDate) { + public Observable getReportSceneResult(int sceneId,int screenId,String ObjectId, int schoolId, int objectType,String startDate,String endDate) { return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL) - .getSceneDetial(screenId,ObjectId,schoolId,objectType,startDate,endDate).compose(RxHelper.rxSchedulerHelper()); + .getSceneDetial(sceneId,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 index 1b63016..82942ef 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java @@ -30,20 +30,20 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres } @Override - public void reportDetialResult(int screenId, int schoolId,String classId,int objectType, String startDate, String endDate) { - mRxManager.register(mIModel.getReportDetialResult(screenId, schoolId,classId, objectType, startDate, endDate).subscribe(new Consumer() { + public void reportDetialResult(int screenId, int schoolId, String classId, int objectType, String startDate, String endDate) { + mRxManager.register(mIModel.getReportDetialResult(screenId, schoolId, classId, objectType, startDate, endDate).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { ToastUtils.showToast(jsonObject.toString()); JsonObject data = jsonObject.getAsJsonObject("data"); - String risePoint=data.get("risePoint").getAsString(); - String pointUpAverage=data.get("pointUpAverage").getAsString(); - float ranking=data.get("ranking").getAsFloat(); - String riseRanking=data.get("riseRanking").getAsString(); - String averageRanking=data.get("averageRanking").getAsString(); - String evaluationDescripe=data.get("evaluationDescripe").getAsString(); - String pscore=String.format("%.1f",data.get("pscore").getAsFloat()); + String risePoint = data.get("risePoint").getAsString(); + String pointUpAverage = data.get("pointUpAverage").getAsString(); + float ranking = data.get("ranking").getAsFloat(); + String riseRanking = data.get("riseRanking").getAsString(); + String averageRanking = data.get("averageRanking").getAsString(); + String evaluationDescripe = data.get("evaluationDescripe").getAsString(); + String pscore = String.format("%.1f", data.get("pscore").getAsFloat()); JsonArray reportDetialArray = data.getAsJsonArray("sceneStatistics"); Gson g = new Gson(); @@ -54,7 +54,7 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres list.add(bean); //加入list } mIView.showDetialList(list); - mIView.showDetialInfo(ranking,pscore,risePoint,pointUpAverage,riseRanking,averageRanking,evaluationDescripe); + mIView.showDetialInfo(ranking, pscore, risePoint, pointUpAverage, riseRanking, averageRanking, evaluationDescripe); } 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 dd0faaa..46e8fb1 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(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() { + public void reportSceneResult(int sceneId,int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate) { + mRxManager.register(mIModel.getReportSceneResult(sceneId,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/activity/report/ReportSceneActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java index ca1cab8..057c471 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java @@ -57,6 +57,7 @@ public class ReportSceneActivity extends BaseMVPCompatActivity implements View.O int screenID = getIntent().getIntExtra("screenID",0); Bundle bundle=new Bundle(); bundle.putInt("screenID",screenID); + reportSceneFragment.setArguments(bundle); fragmentTransaction = getSupportFragmentManager().beginTransaction(); fragmentTransaction.add(R.id.frame_scene, reportSceneFragment) .show(reportSceneFragment).commit(); 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 b5cfc4d..8017111 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 @@ -75,7 +75,7 @@ public class ReportDetialFragment extends BaseMVPCompatFragment