陶汉栋 / ParentWork

Download as
Browse Code »

Commit df3a9c116c99388844521fef257611214c1e33bd

Authored by 姚旭斌
1 parent afec02d6
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 6 changed files with 19 additions and 19 deletions   Show diff stats
app/src/main/assets/migrations/3.sql
View file @afec02d
... ... @@ -1,3 +0,0 @@
1   -ALTER table test ADD COLUMN age INTEGER
2   -ALTER table test ADD COLUMN area INTEGER
3   -ALTER table test ADD COLUMN name TEXT
app/src/main/java/com/shunzhi/parent/api/ReportApi.java
  Diff comments   View file @df3a9c1
... ... @@ -3,18 +3,21 @@ package com.shunzhi.parent.api;
3 3 import com.google.gson.JsonObject;
4 4  
5 5 import io.reactivex.Observable;
6   -import retrofit2.http.GET;
7   -import retrofit2.http.Query;
  6 +import retrofit2.http.Field;
  7 +import retrofit2.http.FormUrlEncoded;
  8 +import retrofit2.http.POST;
8 9  
9 10 /**
10 11 * Created by Administrator on 2018/4/3 0003.
11 12 */
12 13  
13 14 public interface ReportApi {
14   - @GET("/api/EvaluationLabel/GetSceneAnalysisDetails")
15   - Observable<JsonObject> getSceneDetial(@Query("ObjectId") String ObjectId,
16   - @Query("SchoolId") int SchoolId,
17   - @Query("ObjectType") int ObjectTypev,
18   - @Query("startDate") String startDate,
19   - @Query("endDate") String endDate);
  15 + @FormUrlEncoded
  16 + @POST("/api/EvaluationLabel/GetSceneAnalysisDetails")
  17 + Observable<JsonObject> getSceneDetial(@Field("screenId") int screenId,
  18 + @Field("ObjectId") String ObjectId,
  19 + @Field("SchoolId") int SchoolId,
  20 + @Field("ObjectType") int ObjectTypev,
  21 + @Field("startDate") String startDate,
  22 + @Field("endDate") String endDate);
20 23 }
... ...
app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java
  Diff comments   View file @df3a9c1
... ... @@ -16,10 +16,10 @@ import io.reactivex.Observable;
16 16  
17 17 public interface ReportSceneContract {
18 18 abstract class ReportScenePresenter extends BasePresenter<IReportSceneModel,IReportSceneView>{
19   - public abstract void reportSceneResult(String objectId,int schoolId,int objectType,String startDate,String endDate);
  19 + public abstract void reportSceneResult(int screenId,String objectId,int schoolId,int objectType,String startDate,String endDate);
20 20 }
21 21 interface IReportSceneModel extends IBaseModel {
22   - Observable<JsonObject> getReportSceneResult(String objectId, int schoolId, int objectType,String startDate,String endDate);
  22 + Observable<JsonObject> getReportSceneResult(int screenId,String objectId, int schoolId, int objectType,String startDate,String endDate);
23 23 }
24 24 interface IReportSceneView extends IBaseView {
25 25 void showSceneList(List<SceneDetialBean> list);
... ...
app/src/main/java/com/shunzhi/parent/model/report/ReportSceneModel.java
  Diff comments   View file @df3a9c1
... ... @@ -19,8 +19,8 @@ public class ReportSceneModel implements ReportSceneContract.IReportSceneModel {
19 19 return new ReportSceneModel();
20 20 }
21 21 @Override
22   - public Observable<JsonObject> getReportSceneResult(String ObjectId, int schoolId, int objectType,String startDate,String endDate) {
  22 + public Observable<JsonObject> getReportSceneResult(int screenId,String ObjectId, int schoolId, int objectType,String startDate,String endDate) {
23 23 return RetrofitCreateHelper.getInstance().createApi(ReportApi.class, AppConfig.BASE_URL)
24   - .getSceneDetial(ObjectId,schoolId,objectType,startDate,endDate).compose(RxHelper.<JsonObject>rxSchedulerHelper());
  24 + .getSceneDetial(screenId,ObjectId,schoolId,objectType,startDate,endDate).compose(RxHelper.<JsonObject>rxSchedulerHelper());
25 25 }
26 26 }
... ...
app/src/main/java/com/shunzhi/parent/presenter/report/ReportScenePresenter.java
  Diff comments   View file @df3a9c1
... ... @@ -31,8 +31,8 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent
31 31 }
32 32  
33 33 @Override
34   - public void reportSceneResult(String objectId, int schoolId, int objectType,String startDate,String endDate) {
35   - mRxManager.register(mIModel.getReportSceneResult(objectId, schoolId, objectType,startDate,endDate).subscribe(new Consumer<JsonObject>() {
  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>() {
36 36 @Override
37 37 public void accept(JsonObject jsonObject) throws Exception {
38 38 ToastUtils.showToast(jsonObject.toString());
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
  Diff comments   View file @df3a9c1
... ... @@ -34,7 +34,7 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra
34 34 private TextView tv_rank, tv_scoree, tv_pscoree,tv_sceneName;
35 35  
36 36 private ChartView chartView;
37   - String startData="2018-04-04",endData="2018-04-04",objectId="102694";
  37 + String startData="2018-04-04",endData="2018-04-04",objectId="102697";
38 38 int schoolId=1;
39 39  
40 40 @NonNull
... ... @@ -60,7 +60,7 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra
60 60 sceneDetialAdapter = new ReportSceneAdapter(getActivity());
61 61 sceneDetialAdapter.addAll(scenenlist);
62 62 recycle_scene.setAdapter(sceneDetialAdapter);
63   - mPresenter.reportSceneResult(objectId,schoolId, 0,startData,endData);
  63 + mPresenter.reportSceneResult(0,objectId,schoolId, 0,startData,endData);
64 64 initChartViews();
65 65 }
66 66  
... ...