陶汉栋 / ParentWork

Download as
Browse Code »

Commit eda704dec86974be81437b97aa949c3570bb8be0

Authored by 陶汉栋
2 parents ea6ec964 e9804745
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

Showing 17 changed files with 264 additions and 132 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java
  Diff comments   View file @eda704d
... ... @@ -10,7 +10,7 @@ import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
10 10 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
11 11 import com.shunzhi.parent.R;
12 12 import com.shunzhi.parent.bean.report.DeyuDetialBean;
13   -import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
  13 +
14 14  
15 15 /**
16 16 * Created by Administrator on 2018/3/28 0028.
... ... @@ -18,9 +18,20 @@ import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
18 18  
19 19 public class DeyuDetialAdapter extends BaseRecyclerViewAdapter<DeyuDetialBean> {
20 20 private Context mContext = null;
  21 + private int type;
  22 + private String objectId,startDate,endDate;
21 23  
22 24 public DeyuDetialAdapter(Context context) {
23 25 mContext = context;
  26 +
  27 + }
  28 +
  29 + public void setType(int type, String objectId,String startDate,String endDate) {
  30 + this.type = type;
  31 + this.objectId = objectId;
  32 + this.startDate = startDate;
  33 + this.endDate = endDate;
  34 +
24 35 }
25 36  
26 37  
... ... @@ -32,46 +43,45 @@ public class DeyuDetialAdapter extends BaseRecyclerViewAdapter&lt;DeyuDetialBean&gt; {
32 43  
33 44 private class DeyuDetialViewHolder extends BaseRecyclerViewHolder<DeyuDetialBean> {
34 45  
35   - TextView txt_name,jidian,paiming,pingjia;
  46 + TextView txt_name, tv_jidian, tv_paiming, pingjia;
36 47  
37 48 public DeyuDetialViewHolder(View itemView) {
38 49 super(itemView);
39   - txt_name=itemView.findViewById(R.id.txt_name);
40   - jidian=itemView.findViewById(R.id.jidian);
41   - paiming=itemView.findViewById(R.id.paiming);
42   - pingjia=itemView.findViewById(R.id.pingjia);
  50 +
  51 + txt_name = itemView.findViewById(R.id.txt_name);
  52 + tv_jidian = itemView.findViewById(R.id.tv_jidian);
  53 + tv_paiming = itemView.findViewById(R.id.tv_paiming);
  54 + pingjia = itemView.findViewById(R.id.tv_pingjia);
43 55  
44 56 }
45 57  
46 58 @Override
47 59 public void onBindViewHolder(final DeyuDetialBean object, int position) {
48 60 txt_name.setText(object.getSceneName());
49   - jidian.setText("绩点："+String.format("%.1f", object.getPointScore())+" "+object.getRisePoint());
50   - String pStr=getPaiming(object.getRanking());
51   - paiming.setText("排名："+pStr+" "+object.getRiseRanking());
52   - pingjia.setText(object.getEvaluationGrade());
53   -
  61 + tv_jidian.setText("绩点：" + String.format("%.1f", object.getPoint()) + " " + object.getPointChangeName());
  62 + String pStr = getPaiming(object.getSort());
  63 + tv_paiming.setText("排名：" + pStr + " " + object.getSortChangeName());
  64 + pingjia.setText(object.getLeavel());
54 65  
55 66 itemView.setOnClickListener(new View.OnClickListener() {
56 67 @Override
57 68 public void onClick(View v) {
58   - ReportSceneActivity.getInstance(mContext,object.getSceneId());
  69 +
59 70 }
60 71 });
61   -
62 72 }
63 73 }
64 74  
65   - public String getPaiming(float ranking) {
66   - String s=String.valueOf((int)ranking);
  75 + public String getPaiming(float ranking) {
  76 + String s = String.valueOf((int) ranking);
67 77  
68   - return "第"+toChinese(s)+"名";
  78 + return "第" + toChinese(s) + "名";
69 79 }
70 80  
71 81  
72 82 public String toChinese(String string) {
73   - String[] s1 = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" };
74   - String[] s2 = { "十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千" };
  83 + String[] s1 = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
  84 + String[] s2 = {"十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"};
75 85  
76 86 String result = "";
77 87  
... ... @@ -85,7 +95,7 @@ public class DeyuDetialAdapter extends BaseRecyclerViewAdapter&lt;DeyuDetialBean&gt; {
85 95 } else {
86 96 result += s1[num];
87 97 }
88   - System.out.println(" "+result);
  98 + System.out.println(" " + result);
89 99 }
90 100  
91 101 System.out.println("----------------");
... ...
app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
  Diff comments   View file @eda704d
... ... @@ -2,7 +2,6 @@ package com.shunzhi.parent.adapter;
2 2  
3 3  
4 4 import android.content.Context;
5   -import android.content.Intent;
6 5 import android.support.v7.widget.LinearLayoutManager;
7 6 import android.support.v7.widget.RecyclerView;
8 7 import android.view.LayoutInflater;
... ... @@ -63,7 +62,7 @@ public class ReportAdapter extends BaseRecyclerViewAdapter&lt;ReportBean&gt; {
63 62 deyu_content.setOnClickListener(new View.OnClickListener() {
64 63 @Override
65 64 public void onClick(View v) {
66   - context.startActivity(new Intent().setClass(context, ReportDetialActivity.class));
  65 + ReportDetialActivity.getInstance(context,"2018-04-11",2,"34345");
67 66 }
68 67 });
69 68 }
... ...
app/src/main/java/com/shunzhi/parent/api/ReportApi.java
  Diff comments   View file @eda704d
... ... @@ -23,11 +23,11 @@ public interface ReportApi {
23 23 @Field("endDate") String endDate);
24 24  
25 25 @FormUrlEncoded
26   - @POST("api/EvaluationLabel/Getstatisticsanalytical")
  26 + @POST("api/EvaluationWay/getClassAndStudentCal")
27 27 Observable<JsonObject> getReportDetial(@Field("screenId") int screenId,
28 28 @Field("schoolId") int SchoolId,
29   - @Field("objectType") int ObjectType,
30   - @Field("classId") String classId,
  29 + @Field("searchType") int ObjectType,
  30 + @Field("objectId") String classId,
31 31 @Field("startDate") String startDate,
32 32 @Field("endDate") String endDate);
33 33 }
... ...
app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java
  Diff comments   View file @eda704d
... ... @@ -5,14 +5,29 @@ package com.shunzhi.parent.bean.report;
5 5 */
6 6  
7 7 public class DeyuDetialBean {
8   - float pointScore;
9   - String risePoint;
10   - float ranking;
11   - String riseRanking;
12   - String evaluationGrade;
13   - int sceneId;
  8 + float point;
  9 + String pointChangeName;
  10 + float sort;
  11 + String sortChangeName;
  12 + String leavel;
  13 + int sceneID;
14 14 String sceneName;
15 15  
  16 + public String getPointChangeName() {
  17 + return pointChangeName;
  18 + }
  19 +
  20 + public void setPointChangeName(String pointChangeName) {
  21 + this.pointChangeName = pointChangeName;
  22 + }
  23 +
  24 + public String getSortChangeName() {
  25 + return sortChangeName;
  26 + }
  27 +
  28 + public void setSortChangeName(String sortChangeName) {
  29 + this.sortChangeName = sortChangeName;
  30 + }
16 31  
17 32 public String getSceneName() {
18 33 return sceneName;
... ... @@ -22,60 +37,39 @@ public class DeyuDetialBean {
22 37 this.sceneName = sceneName;
23 38 }
24 39  
25   - public float getPointScore() {
26   - return pointScore;
  40 + public float getPoint() {
  41 + return point;
27 42 }
28 43  
29   - public void setPointScore(float pointScore) {
30   - this.pointScore = pointScore;
  44 + public void setPoint(float point) {
  45 + this.point = point;
31 46 }
32 47  
33   - public String getRisePoint() {
34   - return risePoint;
35   - }
36 48  
37   - public void setRisePoint(String risePoint) {
38   - this.risePoint = risePoint;
39   - }
40 49  
41   - public float getRanking() {
42   - return ranking;
  50 + public float getSort() {
  51 + return sort;
43 52 }
44 53  
45   - public void setRanking(float ranking) {
46   - this.ranking = ranking;
  54 + public void setSort(float sort) {
  55 + this.sort = sort;
47 56 }
48 57  
49   - public String getRiseRanking() {
50   - return riseRanking;
51   - }
52 58  
53   - public void setRiseRanking(String riseRanking) {
54   - this.riseRanking = riseRanking;
55   - }
56 59  
57   - public String getEvaluationGrade() {
58   - return evaluationGrade;
  60 + public String getLeavel() {
  61 + return leavel;
59 62 }
60 63  
61   - public void setEvaluationGrade(String evaluationGrade) {
62   - this.evaluationGrade = evaluationGrade;
  64 + public void setLeavel(String leavel) {
  65 + this.leavel = leavel;
63 66 }
64 67  
65   - public int getSceneId() {
66   - return sceneId;
  68 + public int getSceneID() {
  69 + return sceneID;
67 70 }
68 71  
69   - public void setSceneId(int sceneId) {
70   - this.sceneId = sceneId;
  72 + public void setSceneID(int sceneID) {
  73 + this.sceneID = sceneID;
71 74 }
72 75 }
73   -
74   -//score":0.0,
75   -// "pointScore":2.6624999046325684,
76   -// "risePoint":"同期保持一致",
77   -// "ranking":1.0,
78   -// "riseRanking":"与同期保持一致",
79   -// "evaluationGrade":"E",
80   -// "sceneId":10,
81   -// "sceneName":"好人好事"
82 76 \ No newline at end of file
... ...
app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
  Diff comments   View file @eda704d
1 1 package com.shunzhi.parent.contract.report;
2 2  
  3 +import com.google.gson.JsonArray;
3 4 import com.google.gson.JsonObject;
4 5 import com.share.mvpsdk.base.BasePresenter;
5 6 import com.share.mvpsdk.base.IBaseModel;
... ... @@ -22,7 +23,8 @@ public interface ReportDetialContract {
22 23 Observable<JsonObject> getReportDetialResult(int screenId, int schoolId,String classId,int objectType, String startDate, String endDate);
23 24 }
24 25 interface IReportDetialView extends IBaseView {
25   - void showDetialList(List<DeyuDetialBean> list);
  26 +// pointNow,pointPast,sceneName
  27 + void showDetialList(List<DeyuDetialBean> list, JsonArray pointNow, JsonArray pointPast, JsonArray sceneName);
26 28 void showDetialInfo(float rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe);
27 29  
28 30 }
... ...
app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java
  Diff comments   View file @eda704d
... ... @@ -37,15 +37,20 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres
37 37  
38 38 ToastUtils.showToast(jsonObject.toString());
39 39 JsonObject data = jsonObject.getAsJsonObject("data");
40   - String risePoint = data.get("risePoint").getAsString();
41   - String pointUpAverage = data.get("pointUpAverage").getAsString();
  40 + String risePoint = data.get("pointChangeName").getAsString();
  41 + String pointUpAverage = data.get("pointChangeForAveName").getAsString();
  42 +// float ranking = 0.00f;
42 43 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());
  44 + String riseRanking = data.get("rankingChangeName").getAsString();
  45 + String averageRanking = data.get("rankingChangeForAveName").getAsString();
  46 + String evaluationDescripe = data.get("describe").getAsString();
  47 +// String pscore = "";
  48 + String pscore = String.format("%.1f", data.get("point").getAsFloat());
47 49  
48   - JsonArray reportDetialArray = data.getAsJsonArray("sceneStatistics");
  50 + JsonArray pointNow = data.getAsJsonArray("pointNow");//今日
  51 + JsonArray pointPast = data.getAsJsonArray("pointPast");//昨日
  52 + JsonArray sceneName = data.getAsJsonArray("sceneName");//今日场景
  53 + JsonArray reportDetialArray = data.getAsJsonArray("sceneNow");
49 54 Gson g = new Gson();
50 55 List<DeyuDetialBean> list = new ArrayList<>();
51 56 Iterator it = reportDetialArray.iterator(); //Iterator处理
... ... @@ -53,10 +58,11 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres
53 58 DeyuDetialBean bean = g.fromJson(it.next().toString(), DeyuDetialBean.class); //String转化成JavaBean
54 59 list.add(bean); //加入list
55 60 }
56   - mIView.showDetialList(list);
  61 + mIView.showDetialList(list,pointNow,pointPast,sceneName);
57 62 mIView.showDetialInfo(ranking, pscore, risePoint, pointUpAverage, riseRanking, averageRanking, evaluationDescripe);
58 63  
59 64  
  65 +
60 66 }
61 67 }, new Consumer<Throwable>() {
62 68 @Override
... ...
app/src/main/java/com/shunzhi/parent/presenter/report/ReportPresenter.java
  Diff comments   View file @eda704d
... ... @@ -28,7 +28,6 @@ public class ReportPresenter extends ReportContract.ReportPresenter{
28 28 List<ReportBean> list=new ArrayList<>();
29 29 ReportBean reportBean=new ReportBean();
30 30 list.add(reportBean);
31   - list.add(reportBean);
32 31 mIView.UpdateList(list);
33 32  
34 33 }
... ...
app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java
  Diff comments   View file @eda704d
... ... @@ -20,8 +20,11 @@ import com.shunzhi.parent.ui.fragment.report.ReportDetialFragment;
20 20 */
21 21  
22 22 public class ReportDetialActivity extends BaseMVPCompatActivity implements View.OnClickListener{
23   - public static void getInstance(Context context) {
  23 + public static void getInstance(Context context,String day,int schoolId,String objectId ) {
24 24 Intent intent = new Intent(context, ReportDetialActivity.class);
  25 + intent.putExtra("day",day);
  26 + intent.putExtra("schoolId",schoolId);
  27 + intent.putExtra("objectId",objectId);
25 28 context.startActivity(intent);
26 29 }
27 30  
... ... @@ -35,6 +38,9 @@ public class ReportDetialActivity extends BaseMVPCompatActivity implements View.
35 38  
36 39 ReportDetialFragment reportDetialFragment = null;
37 40  
  41 + String day,objectId;
  42 + int schoolId;
  43 +
38 44 @NonNull
39 45 @Override
40 46 public BasePresenter initPresenter() {
... ... @@ -53,7 +59,14 @@ public class ReportDetialActivity extends BaseMVPCompatActivity implements View.
53 59 center_title = findViewById(R.id.center_title);
54 60 center_title.setText("德育报告");
55 61 ivBack.setOnClickListener(this);
56   -
  62 + day=getIntent().getStringExtra("day");
  63 + objectId=getIntent().getStringExtra("objectId");
  64 + schoolId = getIntent().getIntExtra("schoolId",0);
  65 + Bundle bundle=new Bundle();
  66 + bundle.putString("day",day);
  67 + bundle.putString("objectId",objectId);
  68 + bundle.putInt("schoolId",schoolId);
  69 + reportDetialFragment.setArguments(bundle);
57 70 fragmentTransaction = getSupportFragmentManager().beginTransaction();
58 71 fragmentTransaction.add(R.id.frame_detial, reportDetialFragment)
59 72 .show(reportDetialFragment).commit();
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
  Diff comments   View file @eda704d
... ... @@ -16,7 +16,6 @@ import android.widget.TextView;
16 16 import com.share.mvpsdk.base.fragment.BaseCompatFragment;
17 17 import com.shunzhi.parent.R;
18 18 import com.shunzhi.parent.popu.ShaiXuanPop;
19   -import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
20 19 import com.shunzhi.parent.ui.fragment.report.ChengZhangFragment;
21 20  
22 21 import java.util.List;
... ... @@ -86,8 +85,6 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
86 85 if (null == shaiXuanPop) shaiXuanPop = new ShaiXuanPop(getActivity());
87 86 chengZhangFragment2.showShaixuan(handler);
88 87 break;
89   - case R.id.tvNoData:
90   - ReportSceneActivity.getInstance(getActivity(), 3);
91 88 }
92 89 }
93 90  
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java
  Diff comments   View file @eda704d
... ... @@ -8,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
8 8 import android.view.View;
9 9 import android.widget.TextView;
10 10  
  11 +import com.google.gson.JsonArray;
11 12 import com.share.mvpsdk.base.BasePresenter;
12 13 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
13 14 import com.share.mvpsdk.view.chartview.ChartView;
... ... @@ -18,10 +19,7 @@ import com.shunzhi.parent.bean.report.DeyuDetialBean;
18 19 import com.shunzhi.parent.contract.report.ReportDetialContract;
19 20 import com.shunzhi.parent.presenter.report.ReportDetialPresenter;
20 21  
21   -import java.text.SimpleDateFormat;
22 22 import java.util.ArrayList;
23   -import java.util.Calendar;
24   -import java.util.Date;
25 23 import java.util.List;
26 24  
27 25 /**
... ... @@ -35,10 +33,12 @@ public class ReportDetialFragment extends BaseMVPCompatFragment&lt;ReportDetialCont
35 33 private DeyuDetialAdapter deyuDetialAdapter;
36 34 List<DeyuDetialBean> deyulist = new ArrayList<>();
37 35  
38   - private TextView tv_source, tv_bijiao1, tv_bijiao2, tv_bijiao3, tv_bijiao4, tv_date, tv_ranking, tv_describe;
  36 + private TextView tv_source, tv_bijiao1, tv_bijiao2, tv_bijiao3, tv_bijiao4, tv_date, tv_ranking, tv_describe, tvToday, tvYesToday, tvChartData;
39 37  
40 38  
41   - private String startDate = "2018-04 -08", endDate = "2018-04-08";
  39 + private String startDate = "", endDate = "", objectId = "";
  40 +
  41 + int schoolId;
42 42  
43 43 private ChartView chartView;
44 44  
... ... @@ -65,23 +65,32 @@ public class ReportDetialFragment extends BaseMVPCompatFragment&lt;ReportDetialCont
65 65 tv_date = view.findViewById(R.id.tv_date);
66 66 tv_ranking = view.findViewById(R.id.tv_ranking);
67 67 tv_describe = view.findViewById(R.id.tv_describe);
68   - Calendar c = Calendar.getInstance();
69   - Date date = c.getTime();
70   - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
71   - String dateStr = sdf.format(date);
72   - tv_date.setText(dateStr);
  68 + tvToday = view.findViewById(R.id.tvToday);
  69 + tvYesToday = view.findViewById(R.id.tvYesToday);
  70 + tvChartData = view.findViewById(R.id.tvChartData);
  71 + tvToday.setText("今日");
  72 + tvYesToday.setText("昨日");
  73 +
  74 + startDate = getArguments().getString("day");
  75 + endDate = getArguments().getString("day");
  76 + objectId = getArguments().getString("objectId");
  77 + schoolId = getArguments().getInt("schoolId");
  78 +
  79 +
  80 + tv_date.setText(startDate);
73 81  
74 82 recycle_deyu.setLayoutManager(new LinearLayoutManager(getActivity()));
75 83 deyuDetialAdapter = new DeyuDetialAdapter(getActivity());
76 84 recycle_deyu.setAdapter(deyuDetialAdapter);
77   - initChartViews();
78   - mPresenter.reportDetialResult(0, 1, "70", 0, startDate, endDate);
  85 +// initChartViews();
  86 + mPresenter.reportDetialResult(0, schoolId, objectId, 0, startDate, endDate);
  87 +
79 88  
80 89 }
81 90  
82 91 private void initChartViews() {
83 92  
84   - chartView.setColors(R.color.textColor, R.color.huodong_blue, R.color.gray);
  93 + chartView.setColors(R.color.blue, R.color.green, R.color.gray);
85 94 List<InputData> inputDataList = new ArrayList<>();
86 95 List<InputData> inputDataList1 = new ArrayList<>();
87 96 for (int i = 0; i < 7; i++) {
... ... @@ -101,12 +110,41 @@ public class ReportDetialFragment extends BaseMVPCompatFragment&lt;ReportDetialCont
101 110 }
102 111  
103 112 @Override
104   - public void showDetialList(List<DeyuDetialBean> list) {
  113 + public void showDetialList(List<DeyuDetialBean> list, JsonArray pointNow, JsonArray pointPast, JsonArray sceneName) {
105 114 deyulist.clear();
106 115 deyulist.addAll(list);
107 116 deyuDetialAdapter.addAll(deyulist);
108 117 deyuDetialAdapter.notifyDataSetChanged();
109   -
  118 + chartView.setColors(R.color.blue, R.color.green, R.color.gray);
  119 + List<InputData> inputDataListNow = new ArrayList<>();
  120 +
  121 + List<InputData> inputDataListPast = new ArrayList<>();
  122 + try {
  123 +
  124 + InputData inputData0 = new InputData("0", 0);
  125 + inputDataListNow.add(inputData0);
  126 + inputDataListPast.add(inputData0);
  127 + for (int i = 0; i < sceneName.size(); i++) {
  128 +
  129 + InputData inputData = new InputData(sceneName.get(i).getAsString(), (float) pointNow.get(i).getAsDouble());
  130 + inputDataListNow.add(inputData);
  131 +
  132 + InputData inputData1 = new InputData(sceneName.get(i).getAsString(), (float) pointPast.get(i).getAsDouble());
  133 + inputDataListPast.add(inputData1);
  134 +
  135 + }
  136 + if (inputDataListNow.size()>0){
  137 + tvChartData.setVisibility(View.GONE);
  138 + chartView.setVisibility(View.VISIBLE);
  139 + chartView.setChartPaths(inputDataListNow);
  140 + chartView.setChartPaths(inputDataListPast);
  141 + }else {
  142 + tvChartData.setVisibility(View.VISIBLE);
  143 + chartView.setVisibility(View.GONE);
  144 + }
  145 + } catch (Exception e) {
  146 + e.printStackTrace();
  147 + }
110 148  
111 149 }
112 150  
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
  Diff comments   View file @eda704d
... ... @@ -6,7 +6,6 @@ import android.support.annotation.NonNull;
6 6 import android.support.annotation.Nullable;
7 7 import android.support.v7.widget.LinearLayoutManager;
8 8 import android.support.v7.widget.RecyclerView;
9   -import android.util.Log;
10 9 import android.view.View;
11 10 import android.widget.TextView;
12 11  
... ... @@ -36,7 +35,7 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra
36 35 private TextView tv_rank, tv_scoree, tv_pscoree,tv_sceneName;
37 36  
38 37 private ChartView chartView;
39   - String startData="2018-04-03",endData="2018-04-03",objectId="102697";
  38 + String startData="",endData="",objectId="";
40 39 int schoolId=1,sceneId;
41 40  
42 41 @NonNull
... ... @@ -77,31 +76,32 @@ public class ReportSceneFragment extends BaseMVPCompatFragment&lt;ReportSceneContra
77 76  
78 77 @Override
79 78 public void showChart(List<ChatBean> list1, List<ChatBean> list2, List<ChatBean> list3) {
80   - Log.e("11111", "1111----====");
81 79 if(list1==null||list2==null||list3==null) {
82   - Log.e("11111", "----====");
83 80 return ;
84 81 }
85 82 chartView.setColors(R.color.textColor, R.color.huodong_blue, R.color.gray);
86 83 List<InputData> inputDataList1 = new ArrayList<>();
87 84 List<InputData> inputDataList2 = new ArrayList<>();
88 85 List<InputData> inputDataList3 = new ArrayList<>();
  86 + inputDataList1.add(new InputData("0",0));
  87 + inputDataList2.add(new InputData("0",0));
  88 + inputDataList3.add(new InputData("0",0));
89 89 for (int i = 0; i < list1.size(); i++) {
90   - InputData inputData = new InputData(list1.get(i).getDate(), (long)list1.get(i).getGap());
  90 + InputData inputData = new InputData(list1.get(i).getDate(), list1.get(i).getGap());
91 91 inputDataList1.add(inputData);
92 92 }
93 93  
94 94 chartView.setChartPaths(inputDataList1);
95 95  
96 96 for (int i = 0; i < list2.size(); i++) {
97   - InputData inputData = new InputData(list2.get(i).getDate(), (long)list2.get(i).getGap());
  97 + InputData inputData = new InputData(list2.get(i).getDate(), list2.get(i).getGap());
98 98 inputDataList2.add(inputData);
99 99 }
100 100  
101 101 chartView.setChartPaths(inputDataList2);
102 102  
103 103 for (int i = 0; i <list3.size(); i++) {
104   - InputData inputData = new InputData(list3.get(i).getDate(),(long) list3.get(i).getGap());
  104 + InputData inputData = new InputData(list3.get(i).getDate(), list3.get(i).getGap());
105 105 inputDataList3.add(inputData);
106 106 }
107 107  
... ...
app/src/main/res/drawable/shape_blue_8.xml 0 → 100644
  Diff comments   View file @eda704d
... ... @@ -0,0 +1,7 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <corners android:radius="@dimen/size_dp_8"/>
  5 +
  6 + <solid android:color="@color/blue"/>
  7 +</shape>
0 8 \ No newline at end of file
... ...
app/src/main/res/drawable/shape_green_circle.xml 0 → 100644
  Diff comments   View file @eda704d
... ... @@ -0,0 +1,7 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <corners android:radius="@dimen/size_dp_8"/>
  5 + <solid android:color="@color/green"/>
  6 +
  7 +</shape>
0 8 \ No newline at end of file
... ...
app/src/main/res/layout/fragment_report.xml
  Diff comments   View file @eda704d
... ... @@ -69,7 +69,7 @@
69 69 android:layout_width="match_parent"
70 70 android:layout_height="match_parent"
71 71 android:background="@color/white"
72   - android:visibility="visible"
  72 + android:visibility="gone"
73 73  
74 74 >
75 75  
... ...
app/src/main/res/layout/fragment_report_detial.xml
  Diff comments   View file @eda704d
... ... @@ -168,38 +168,97 @@
168 168  
169 169 </LinearLayout>
170 170  
171   - <FrameLayout
  171 + <android.support.v4.widget.NestedScrollView
172 172 android:layout_width="match_parent"
173   - android:layout_height="wrap_content"
174   - android:layout_marginTop="@dimen/size_dp_10">
  173 + android:layout_height="0dp"
  174 + android:layout_weight="1.5">
175 175  
176   - <com.share.mvpsdk.view.chartview.ChartView
  176 + <LinearLayout
177 177 android:layout_width="match_parent"
178 178 android:layout_height="match_parent"
179   - android:id="@+id/chartView"
180   - />
  179 + android:orientation="vertical">
181 180  
182   - <TextView
183   - android:visibility="gone"
184   - android:layout_width="match_parent"
185   - android:layout_height="200dp"
186   - android:text="图表控件"
187   - android:layout_gravity="center"
188   - android:gravity="center"
189   - android:textColor="@color/md_red_500"
190   - android:background="@color/huodong_blue" />
  181 + <LinearLayout
  182 + android:layout_marginTop="@dimen/size_dp_10"
  183 + android:layout_marginBottom="@dimen/size_dp_10"
  184 + android:gravity="center"
  185 + android:layout_width="wrap_content"
  186 + android:layout_height="wrap_content"
  187 + android:layout_gravity="center_horizontal"
  188 + >
  189 +
  190 + <TextView
  191 + android:layout_width="@dimen/size_dp_16"
  192 + android:layout_height="@dimen/size_dp_16"
  193 + android:background="@drawable/shape_blue_8"
  194 + />
191 195  
192   - </FrameLayout>
  196 + <TextView
  197 + android:layout_marginLeft="@dimen/size_dp_5"
  198 + android:layout_width="wrap_content"
  199 + android:layout_height="wrap_content"
  200 + android:text="今日"
  201 + android:id="@+id/tvToday"
  202 + android:textSize="@dimen/size_dp_16"
  203 + android:textColor="@color/textColor"
  204 + />
193 205  
  206 + <TextView
  207 + android:layout_marginLeft="@dimen/size_dp_25"
  208 + android:layout_width="@dimen/size_dp_16"
  209 + android:layout_height="@dimen/size_dp_16"
  210 + android:background="@drawable/shape_green_circle"
  211 + />
194 212  
195   - <android.support.v7.widget.RecyclerView
196   - android:id="@+id/recycle_deyu"
197   - android:layout_width="match_parent"
198   - android:layout_height="wrap_content"
199   - android:layout_marginTop="@dimen/size_dp_10"
200   - android:background="@color/bgColor">
  213 + <TextView
  214 + android:layout_marginLeft="@dimen/size_dp_5"
  215 + android:layout_width="wrap_content"
  216 + android:layout_height="wrap_content"
  217 + android:text="昨日"
  218 + android:id="@+id/tvYesToday"
  219 + android:textSize="@dimen/size_dp_16"
  220 + android:textColor="@color/textColor"
  221 + />
  222 +
  223 + </LinearLayout>
  224 + <FrameLayout
  225 + android:layout_width="match_parent"
  226 + android:layout_height="@dimen/size_dp_200"
  227 + android:layout_marginTop="@dimen/size_dp_10">
  228 +
  229 + <com.share.mvpsdk.view.chartview.ChartView
  230 + android:id="@+id/chartView"
  231 + android:layout_width="match_parent"
  232 + android:layout_height="match_parent" />
  233 +
  234 + <TextView
  235 + android:layout_width="match_parent"
  236 + android:layout_height="match_parent"
  237 + android:layout_gravity="center"
  238 + android:background="@color/blue"
  239 + android:textSize="@dimen/size_dp_18"
  240 + android:gravity="center"
  241 + android:text="暂无图表数据"
  242 + android:id="@+id/tvChartData"
  243 + android:textColor="@color/textColor"
  244 + android:visibility="gone" />
  245 +
  246 + </FrameLayout>
  247 +
  248 +
  249 + <android.support.v7.widget.RecyclerView
  250 + android:id="@+id/recycle_deyu"
  251 + android:layout_width="match_parent"
  252 + android:layout_height="wrap_content"
  253 + android:layout_marginTop="@dimen/size_dp_10"
  254 + android:background="@color/bgColor">
  255 +
  256 + </android.support.v7.widget.RecyclerView>
  257 +
  258 +
  259 + </LinearLayout>
201 260  
202   - </android.support.v7.widget.RecyclerView>
  261 + </android.support.v4.widget.NestedScrollView>
203 262  
204 263 </LinearLayout>
205 264  
... ...
app/src/main/res/layout/item_deyu_detial.xml
  Diff comments   View file @eda704d
... ... @@ -30,13 +30,13 @@
30 30 android:layout_height="wrap_content">
31 31  
32 32 <TextView
33   - android:id="@+id/jidian"
  33 + android:id="@+id/tv_jidian"
34 34 android:layout_width="wrap_content"
35 35 android:layout_height="wrap_content"
36 36 android:text="绩点：4.3 增长1.1分" />
37 37 <TextView
38 38 android:layout_marginLeft="10dp"
39   - android:id="@+id/paiming"
  39 + android:id="@+id/tv_paiming"
40 40 android:layout_width="wrap_content"
41 41 android:layout_height="wrap_content"
42 42 android:text="排名：第三名 增长1名" />
... ... @@ -47,7 +47,7 @@
47 47  
48 48  
49 49 <TextView
50   - android:id="@+id/pingjia"
  50 + android:id="@+id/tv_pingjia"
51 51 android:layout_width="wrap_content"
52 52 android:layout_height="wrap_content"
53 53 android:paddingTop="5dp"
... ...
app/src/main/res/values/colors.xml
  Diff comments   View file @eda704d
... ... @@ -8,7 +8,8 @@
8 8 <color name="hintTextColor">#494947</color>
9 9 <color name="bottomline">#B8B8B9</color>
10 10 <color name="bg_main">#F0EFF5</color>
11   -
  11 + <color name="blue">#2956FE</color>
  12 + <color name="green">#00CB87</color>
12 13 <color name="back_top">#A6DAFF</color>
13 14 <color name="textBlue">#ACC9FC</color>
14 15 <color name="titleColor">#A6DAFF</color>
... ...