陶汉栋 / ParentWork

Download as
Browse Code »

Commit afec02d6efb5af42afcf20c1178ac19a8a17b3d7

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

no message

Showing 7 changed files with 15 additions and 14 deletions   Show diff stats
.idea/modules.xml
  Diff comments   View file @afec02d
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 <modules> 4 <modules>
5 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 5 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
6 <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
7 - <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />  
8 <module fileurl="file://F:\parentwork\parentWorkHolper.iml" filepath="F:\parentwork\parentWorkHolper.iml" /> 7 <module fileurl="file://F:\parentwork\parentWorkHolper.iml" filepath="F:\parentwork\parentWorkHolper.iml" />
  8 + <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />
9 <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" /> 9 <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
10 <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" /> 10 <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" />
11 <module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" /> 11 <module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" />
app/libs/processor.jar
View file @afec02d
No preview for this file type
app/src/main/java/com/shunzhi/parent/api/ReportApi.java
  Diff comments   View file @afec02d
@@ -12,5 +12,9 @@ import retrofit2.http.Query; @@ -12,5 +12,9 @@ import retrofit2.http.Query;
12 12
13 public interface ReportApi { 13 public interface ReportApi {
14 @GET("/api/EvaluationLabel/GetSceneAnalysisDetails") 14 @GET("/api/EvaluationLabel/GetSceneAnalysisDetails")
15 - Observable<JsonObject> getSceneDetial(@Query("ObjectId") String ObjectId, @Query("SchoolId") int SchoolId, @Query("ObjectType") int ObjectType); 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);
16 } 20 }
app/src/main/java/com/shunzhi/parent/contract/report/ReportSceneContract.java
  Diff comments   View file @afec02d
@@ -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(String objectId,int schoolId,int objectType); 19 + public abstract void reportSceneResult(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(String objectId, int schoolId, int objectType); 22 + Observable<JsonObject> getReportSceneResult(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/ReportSceneModel.java
  Diff comments   View file @afec02d
@@ -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(String ObjectId, int schoolId, int objectType) { 22 + public Observable<JsonObject> getReportSceneResult(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(ObjectId,schoolId,objectType).compose(RxHelper.<JsonObject>rxSchedulerHelper()); 24 + .getSceneDetial(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 @afec02d
1 package com.shunzhi.parent.presenter.report; 1 package com.shunzhi.parent.presenter.report;
2 2
3 3
4 -import android.util.Log;  
5 -  
6 import com.google.gson.Gson; 4 import com.google.gson.Gson;
7 import com.google.gson.JsonArray; 5 import com.google.gson.JsonArray;
8 import com.google.gson.JsonObject; 6 import com.google.gson.JsonObject;
@@ -33,8 +31,8 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent @@ -33,8 +31,8 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent
33 } 31 }
34 32
35 @Override 33 @Override
36 - public void reportSceneResult(String objectId, int schoolId, int objectType) {  
37 - mRxManager.register(mIModel.getReportSceneResult(objectId, schoolId, objectType).subscribe(new Consumer<JsonObject>() { 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>() {
38 @Override 36 @Override
39 public void accept(JsonObject jsonObject) throws Exception { 37 public void accept(JsonObject jsonObject) throws Exception {
40 ToastUtils.showToast(jsonObject.toString()); 38 ToastUtils.showToast(jsonObject.toString());
@@ -47,7 +45,6 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent @@ -47,7 +45,6 @@ public class ReportScenePresenter extends ReportSceneContract.ReportScenePresent
47 Gson g = new Gson(); 45 Gson g = new Gson();
48 List<SceneDetialBean> list = new ArrayList<>(); 46 List<SceneDetialBean> list = new ArrayList<>();
49 Iterator it = behaviorArray.iterator(); //Iterator处理 47 Iterator it = behaviorArray.iterator(); //Iterator处理
50 - int i=0;  
51 while (it.hasNext()) { //循环 48 while (it.hasNext()) { //循环
52 SceneDetialBean bean = g.fromJson(it.next().toString(), SceneDetialBean.class); //String转化成JavaBean 49 SceneDetialBean bean = g.fromJson(it.next().toString(), SceneDetialBean.class); //String转化成JavaBean
53 list.add(bean); //加入list 50 list.add(bean); //加入list
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
  Diff comments   View file @afec02d
@@ -34,6 +34,8 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra @@ -34,6 +34,8 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra
34 private TextView tv_rank, tv_scoree, tv_pscoree,tv_sceneName; 34 private TextView tv_rank, tv_scoree, tv_pscoree,tv_sceneName;
35 35
36 private ChartView chartView; 36 private ChartView chartView;
  37 + String startData="2018-04-04",endData="2018-04-04",objectId="102694";
  38 + int schoolId=1;
37 39
38 @NonNull 40 @NonNull
39 @Override 41 @Override
@@ -58,10 +60,8 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra @@ -58,10 +60,8 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra
58 sceneDetialAdapter = new ReportSceneAdapter(getActivity()); 60 sceneDetialAdapter = new ReportSceneAdapter(getActivity());
59 sceneDetialAdapter.addAll(scenenlist); 61 sceneDetialAdapter.addAll(scenenlist);
60 recycle_scene.setAdapter(sceneDetialAdapter); 62 recycle_scene.setAdapter(sceneDetialAdapter);
61 - mPresenter.reportSceneResult("102697", 1, 0); 63 + mPresenter.reportSceneResult(objectId,schoolId, 0,startData,endData);
62 initChartViews(); 64 initChartViews();
63 -  
64 -  
65 } 65 }
66 66
67 private void initChartViews() { 67 private void initChartViews() {