Commit 9595d58e4d771d4bbce1a2ff6dbc8f14c81bccd6
1 parent
08b7799e
Exists in
yxb_dev
and in
2 other branches
no message
Showing
10 changed files
with
31 additions
and
28 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java
| @@ -49,6 +49,7 @@ public class DeyuDetialAdapter extends BaseRecyclerViewAdapter<DeyuDetialBean> { | @@ -49,6 +49,7 @@ public class DeyuDetialAdapter extends BaseRecyclerViewAdapter<DeyuDetialBean> { | ||
| 49 | jidian.setText("绩点："+String.format("%.1f", object.getPointScore())+" "+object.getRisePoint()); | 49 | jidian.setText("绩点："+String.format("%.1f", object.getPointScore())+" "+object.getRisePoint()); |
| 50 | String pStr=getPaiming(object.getRanking()); | 50 | String pStr=getPaiming(object.getRanking()); |
| 51 | paiming.setText("排名："+pStr+" "+object.getRiseRanking()); | 51 | paiming.setText("排名："+pStr+" "+object.getRiseRanking()); |
| 52 | + pingjia.setText(object.getEvaluationGrade()); | ||
| 52 | 53 | ||
| 53 | 54 | ||
| 54 | itemView.setOnClickListener(new View.OnClickListener() { | 55 | itemView.setOnClickListener(new View.OnClickListener() { |
app/src/main/java/com/shunzhi/parent/api/ReportApi.java
| @@ -14,20 +14,20 @@ import retrofit2.http.POST; | @@ -14,20 +14,20 @@ import retrofit2.http.POST; | ||
| 14 | public interface ReportApi { | 14 | public interface ReportApi { |
| 15 | @FormUrlEncoded | 15 | @FormUrlEncoded |
| 16 | @POST("api/EvaluationLabel/GetSceneAnalysisDetails") | 16 | @POST("api/EvaluationLabel/GetSceneAnalysisDetails") |
| 17 | - Observable<JsonObject> getSceneDetial(@Field("screenId") int screenId, | 17 | + Observable<JsonObject> getSceneDetial(@Field("sceneId") int sceneId, |
| 18 | + @Field("screenId") int screenId, | ||
| 18 | @Field("ObjectId") String ObjectId, | 19 | @Field("ObjectId") String ObjectId, |
| 19 | @Field("SchoolId") int SchoolId, | 20 | @Field("SchoolId") int SchoolId, |
| 20 | @Field("ObjectType") int ObjectType, | 21 | @Field("ObjectType") int ObjectType, |
| 21 | @Field("startDate") String startDate, | 22 | @Field("startDate") String startDate, |
| 22 | @Field("endDate") String endDate); | 23 | @Field("endDate") String endDate); |
| 23 | 24 | ||
| 24 | - | ||
| 25 | @FormUrlEncoded | 25 | @FormUrlEncoded |
| 26 | - @POST("/api/EvaluationLabel/GetStatisticalAnalysis") | 26 | + @POST("api/EvaluationLabel/Getstatisticsanalytical") |
| 27 | Observable<JsonObject> getReportDetial(@Field("screenId") int screenId, | 27 | Observable<JsonObject> getReportDetial(@Field("screenId") int screenId, |
| 28 | - @Field("schoolId") int SchoolId, | ||
| 29 | -// @Field("ObjectType") int ObjectType, | ||
| 30 | - @Field("classId")String classId, | ||
| 31 | - @Field("startDate") String startDate, | ||
| 32 | - @Field("endDate") String endDate); | 28 | + @Field("schoolId") int SchoolId, |
| 29 | + @Field("objectType") int ObjectType, | ||
| 30 | + @Field("classId") String classId, | ||
| 31 | + @Field("startDate") String startDate, | ||
| 32 | + @Field("endDate") String endDate); | ||
| 33 | } | 33 | } |
app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java
| @@ -16,10 +16,10 @@ import io.reactivex.Observable; | @@ -16,10 +16,10 @@ import io.reactivex.Observable; | ||
| 16 | 16 | ||
| 17 | public interface ReportSceneContract { | 17 | public interface ReportSceneContract { |
| 18 | abstract class ReportScenePresenter extends BasePresenter<IReportSceneModel,IReportSceneView>{ | 18 | abstract class ReportScenePresenter extends BasePresenter<IReportSceneModel,IReportSceneView>{ |
| 19 | - public abstract void reportSceneResult(int screenId,String objectId,int schoolId,int objectType,String startDate,String endDate); | 19 | + public abstract void reportSceneResult(int sceneId,int screenId,String objectId,int schoolId,int objectType,String startDate,String endDate); |
| 20 | } | 20 | } |
| 21 | interface IReportSceneModel extends IBaseModel { | 21 | interface IReportSceneModel extends IBaseModel { |
| 22 | - Observable<JsonObject> getReportSceneResult(int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate); | 22 | + Observable<JsonObject> getReportSceneResult(int sceneId,int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate); |
| 23 | } | 23 | } |
| 24 | interface IReportSceneView extends IBaseView { | 24 | interface IReportSceneView extends IBaseView { |
| 25 | void showSceneList(List<SceneDetialBean> list); | 25 | void showSceneList(List<SceneDetialBean> list); |
app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java
| @@ -21,6 +21,6 @@ public class ReportDetialModel implements ReportDetialContract.IReportDetialMod | @@ -21,6 +21,6 @@ public class ReportDetialModel implements ReportDetialContract.IReportDetialMod | ||
| 21 | 21 | ||
| 22 | @Override | 22 | @Override |
| 23 | public Observable<JsonObject> getReportDetialResult(int screenId, int schoolId,String classId, int objectType, String startDate, String endDate) { | 23 | public Observable<JsonObject> getReportDetialResult(int screenId, int schoolId,String classId, int objectType, String startDate, String endDate) { |
| 24 | - return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL).getReportDetial(screenId,schoolId,classId,startDate,endDate).compose(RxHelper.<JsonObject>rxSchedulerHelper()); | 24 | + return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL).getReportDetial(screenId,schoolId,objectType,classId,startDate,endDate).compose(RxHelper.<JsonObject>rxSchedulerHelper()); |
| 25 | } | 25 | } |
| 26 | } | 26 | } |
app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java
| @@ -19,8 +19,8 @@ public class ReportSceneModel implements ReportSceneContract.IReportSceneModel { | @@ -19,8 +19,8 @@ public class ReportSceneModel implements ReportSceneContract.IReportSceneModel { | ||
| 19 | return new ReportSceneModel(); | 19 | return new ReportSceneModel(); |
| 20 | } | 20 | } |
| 21 | @Override | 21 | @Override |
| 22 | - public Observable<JsonObject> getReportSceneResult(int screenId,String ObjectId, int schoolId, int objectType,String startDate,String endDate) { | 22 | + public Observable<JsonObject> getReportSceneResult(int sceneId,int screenId,String ObjectId, int schoolId, int objectType,String startDate,String endDate) { |
| 23 | return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL) | 23 | return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL) |
| 24 | - .getSceneDetial(screenId,ObjectId,schoolId,objectType,startDate,endDate).compose(RxHelper.<JsonObject>rxSchedulerHelper()); | 24 | + .getSceneDetial(sceneId,screenId,ObjectId,schoolId,objectType,startDate,endDate).compose(RxHelper.<JsonObject>rxSchedulerHelper()); |
| 25 | } | 25 | } |
| 26 | } | 26 | } |
app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java
| @@ -30,20 +30,20 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres | @@ -30,20 +30,20 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres | ||
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | @Override | 32 | @Override |
| 33 | - public void reportDetialResult(int screenId, int schoolId,String classId,int objectType, String startDate, String endDate) { | ||
| 34 | - mRxManager.register(mIModel.getReportDetialResult(screenId, schoolId,classId, objectType, startDate, endDate).subscribe(new Consumer<JsonObject>() { | 33 | + public void reportDetialResult(int screenId, int schoolId, String classId, int objectType, String startDate, String endDate) { |
| 34 | + mRxManager.register(mIModel.getReportDetialResult(screenId, schoolId, classId, objectType, startDate, endDate).subscribe(new Consumer<JsonObject>() { | ||
| 35 | @Override | 35 | @Override |
| 36 | public void accept(JsonObject jsonObject) throws Exception { | 36 | public void accept(JsonObject jsonObject) throws Exception { |
| 37 | 37 | ||
| 38 | ToastUtils.showToast(jsonObject.toString()); | 38 | ToastUtils.showToast(jsonObject.toString()); |
| 39 | JsonObject data = jsonObject.getAsJsonObject("data"); | 39 | JsonObject data = jsonObject.getAsJsonObject("data"); |
| 40 | - String risePoint=data.get("risePoint").getAsString(); | ||
| 41 | - String pointUpAverage=data.get("pointUpAverage").getAsString(); | ||
| 42 | - float ranking=data.get("ranking").getAsFloat(); | ||
| 43 | - String riseRanking=data.get("riseRanking").getAsString(); | ||
| 44 | - String averageRanking=data.get("averageRanking").getAsString(); | ||
| 45 | - String evaluationDescripe=data.get("evaluationDescripe").getAsString(); | ||
| 46 | - String pscore=String.format("%.1f",data.get("pscore").getAsFloat()); | 40 | + String risePoint = data.get("risePoint").getAsString(); |
| 41 | + String pointUpAverage = data.get("pointUpAverage").getAsString(); | ||
| 42 | + float ranking = data.get("ranking").getAsFloat(); | ||
| 43 | + String riseRanking = data.get("riseRanking").getAsString(); | ||
| 44 | + String averageRanking = data.get("averageRanking").getAsString(); | ||
| 45 | + String evaluationDescripe = data.get("evaluationDescripe").getAsString(); | ||
| 46 | + String pscore = String.format("%.1f", data.get("pscore").getAsFloat()); | ||
| 47 | 47 | ||
| 48 | JsonArray reportDetialArray = data.getAsJsonArray("sceneStatistics"); | 48 | JsonArray reportDetialArray = data.getAsJsonArray("sceneStatistics"); |
| 49 | Gson g = new Gson(); | 49 | Gson g = new Gson(); |
| @@ -54,7 +54,7 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres | @@ -54,7 +54,7 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres | ||
| 54 | list.add(bean); //加入list | 54 | list.add(bean); //加入list |
| 55 | } | 55 | } |
| 56 | mIView.showDetialList(list); | 56 | mIView.showDetialList(list); |
| 57 | - mIView.showDetialInfo(ranking,pscore,risePoint,pointUpAverage,riseRanking,averageRanking,evaluationDescripe); | 57 | + mIView.showDetialInfo(ranking, pscore, risePoint, pointUpAverage, riseRanking, averageRanking, evaluationDescripe); |
| 58 | 58 | ||
| 59 | 59 | ||
| 60 | } | 60 | } |
app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java
| @@ -31,8 +31,8 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent | @@ -31,8 +31,8 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent | ||
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | @Override | 33 | @Override |
| 34 | - public void reportSceneResult(int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate) { | ||
| 35 | - mRxManager.register(mIModel.getReportSceneResult(screenId,objectId, schoolId, objectType,startDate,endDate).subscribe(new Consumer<JsonObject>() { | 34 | + public void reportSceneResult(int sceneId,int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate) { |
| 35 | + mRxManager.register(mIModel.getReportSceneResult(sceneId,screenId,objectId, schoolId, objectType,startDate,endDate).subscribe(new Consumer<JsonObject>() { | ||
| 36 | @Override | 36 | @Override |
| 37 | public void accept(JsonObject jsonObject) throws Exception { | 37 | public void accept(JsonObject jsonObject) throws Exception { |
| 38 | ToastUtils.showToast(jsonObject.toString()); | 38 | ToastUtils.showToast(jsonObject.toString()); |
app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportSceneActivity.java
| @@ -57,6 +57,7 @@ public class ReportSceneActivity extends BaseMVPCompatActivity implements View.O | @@ -57,6 +57,7 @@ public class ReportSceneActivity extends BaseMVPCompatActivity implements View.O | ||
| 57 | int screenID = getIntent().getIntExtra("screenID",0); | 57 | int screenID = getIntent().getIntExtra("screenID",0); |
| 58 | Bundle bundle=new Bundle(); | 58 | Bundle bundle=new Bundle(); |
| 59 | bundle.putInt("screenID",screenID); | 59 | bundle.putInt("screenID",screenID); |
| 60 | + reportSceneFragment.setArguments(bundle); | ||
| 60 | fragmentTransaction = getSupportFragmentManager().beginTransaction(); | 61 | fragmentTransaction = getSupportFragmentManager().beginTransaction(); |
| 61 | fragmentTransaction.add(R.id.frame_scene, reportSceneFragment) | 62 | fragmentTransaction.add(R.id.frame_scene, reportSceneFragment) |
| 62 | .show(reportSceneFragment).commit(); | 63 | .show(reportSceneFragment).commit(); |
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java
| @@ -75,7 +75,7 @@ public class ReportDetialFragment extends BaseMVPCompatFragment<ReportDetialCont | @@ -75,7 +75,7 @@ public class ReportDetialFragment extends BaseMVPCompatFragment<ReportDetialCont | ||
| 75 | deyuDetialAdapter = new DeyuDetialAdapter(getActivity()); | 75 | deyuDetialAdapter = new DeyuDetialAdapter(getActivity()); |
| 76 | recycle_deyu.setAdapter(deyuDetialAdapter); | 76 | recycle_deyu.setAdapter(deyuDetialAdapter); |
| 77 | initChartViews(); | 77 | initChartViews(); |
| 78 | - mPresenter.reportDetialResult(1, 1, "70", 0, startDate, endDate); | 78 | + mPresenter.reportDetialResult(1, 1, "70", 1, startDate, endDate); |
| 79 | 79 | ||
| 80 | } | 80 | } |
| 81 | 81 |
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
| @@ -35,7 +35,7 @@ public class ReportSceneFragment extends BaseMVPCompatFragment<ReportSceneContra | @@ -35,7 +35,7 @@ public class ReportSceneFragment extends BaseMVPCompatFragment<ReportSceneContra | ||
| 35 | 35 | ||
| 36 | private ChartView chartView; | 36 | private ChartView chartView; |
| 37 | String startData="2018-04-04",endData="2018-04-04",objectId="102697"; | 37 | String startData="2018-04-04",endData="2018-04-04",objectId="102697"; |
| 38 | - int schoolId=1; | 38 | + int schoolId=1,sceneId; |
| 39 | 39 | ||
| 40 | @NonNull | 40 | @NonNull |
| 41 | @Override | 41 | @Override |
| @@ -56,11 +56,12 @@ public class ReportSceneFragment extends BaseMVPCompatFragment<ReportSceneContra | @@ -56,11 +56,12 @@ public class ReportSceneFragment extends BaseMVPCompatFragment<ReportSceneContra | ||
| 56 | tv_scoree = view.findViewById(R.id.scoree); | 56 | tv_scoree = view.findViewById(R.id.scoree); |
| 57 | tv_pscoree = view.findViewById(R.id.pscoree); | 57 | tv_pscoree = view.findViewById(R.id.pscoree); |
| 58 | tv_sceneName = view.findViewById(R.id.sceneName); | 58 | tv_sceneName = view.findViewById(R.id.sceneName); |
| 59 | + sceneId=getArguments().getInt("sceneID",0); | ||
| 59 | recycle_scene.setLayoutManager(new LinearLayoutManager(getActivity())); | 60 | recycle_scene.setLayoutManager(new LinearLayoutManager(getActivity())); |
| 60 | sceneDetialAdapter = new ReportSceneAdapter(getActivity()); | 61 | sceneDetialAdapter = new ReportSceneAdapter(getActivity()); |
| 61 | sceneDetialAdapter.addAll(scenenlist); | 62 | sceneDetialAdapter.addAll(scenenlist); |
| 62 | recycle_scene.setAdapter(sceneDetialAdapter); | 63 | recycle_scene.setAdapter(sceneDetialAdapter); |
| 63 | - mPresenter.reportSceneResult(0,objectId,schoolId, 0,startData,endData); | 64 | + mPresenter.reportSceneResult(sceneId,0,objectId,schoolId, 0,startData,endData); |
| 64 | initChartViews(); | 65 | initChartViews(); |
| 65 | } | 66 | } |
| 66 | 67 |