From e9804745e612c68d7ec65a65f2cbda9e529b39d4 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Fri, 13 Apr 2018 19:21:57 +0800
Subject: [PATCH] no message
---
app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java | 48 +++++++++++++++++++++++++++++-------------------
app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java | 3 +--
app/src/main/java/com/shunzhi/parent/api/ReportApi.java | 6 +++---
app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java | 80 +++++++++++++++++++++++++++++++++++++-------------------------------------------
app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java | 4 +++-
app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java | 22 ++++++++++++++--------
app/src/main/java/com/shunzhi/parent/presenter/report/ReportPresenter.java | 1 -
app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java | 17 +++++++++++++++--
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java | 3 ---
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportDetialFragment.java | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java | 14 +++++++-------
app/src/main/res/drawable/shape_blue_8.xml | 7 +++++++
app/src/main/res/drawable/shape_green_circle.xml | 7 +++++++
app/src/main/res/layout/fragment_report.xml | 2 +-
app/src/main/res/layout/fragment_report_detial.xml | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
app/src/main/res/layout/item_deyu_detial.xml | 6 +++---
app/src/main/res/values/colors.xml | 3 ++-
17 files changed, 264 insertions(+), 132 deletions(-)
create mode 100644 app/src/main/res/drawable/shape_blue_8.xml
create mode 100644 app/src/main/res/drawable/shape_green_circle.xml
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 22b26f5..bd8bcf3 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/DeyuDetialAdapter.java
@@ -10,7 +10,7 @@ import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
import com.shunzhi.parent.R;
import com.shunzhi.parent.bean.report.DeyuDetialBean;
-import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
+
/**
* Created by Administrator on 2018/3/28 0028.
@@ -18,9 +18,20 @@ import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
public class DeyuDetialAdapter extends BaseRecyclerViewAdapter<DeyuDetialBean> {
private Context mContext = null;
+ private int type;
+ private String objectId,startDate,endDate;
public DeyuDetialAdapter(Context context) {
mContext = context;
+
+ }
+
+ public void setType(int type, String objectId,String startDate,String endDate) {
+ this.type = type;
+ this.objectId = objectId;
+ this.startDate = startDate;
+ this.endDate = endDate;
+
}
@@ -32,46 +43,45 @@ public class DeyuDetialAdapter extends BaseRecyclerViewAdapter<DeyuDetialBean> {
private class DeyuDetialViewHolder extends BaseRecyclerViewHolder<DeyuDetialBean> {
- TextView txt_name,jidian,paiming,pingjia;
+ TextView txt_name, tv_jidian, tv_paiming, pingjia;
public DeyuDetialViewHolder(View itemView) {
super(itemView);
- txt_name=itemView.findViewById(R.id.txt_name);
- jidian=itemView.findViewById(R.id.jidian);
- paiming=itemView.findViewById(R.id.paiming);
- pingjia=itemView.findViewById(R.id.pingjia);
+
+ txt_name = itemView.findViewById(R.id.txt_name);
+ tv_jidian = itemView.findViewById(R.id.tv_jidian);
+ tv_paiming = itemView.findViewById(R.id.tv_paiming);
+ pingjia = itemView.findViewById(R.id.tv_pingjia);
}
@Override
public void onBindViewHolder(final DeyuDetialBean object, int position) {
txt_name.setText(object.getSceneName());
- jidian.setText("绩点："+String.format("%.1f", object.getPointScore())+" "+object.getRisePoint());
- String pStr=getPaiming(object.getRanking());
- paiming.setText("排名："+pStr+" "+object.getRiseRanking());
- pingjia.setText(object.getEvaluationGrade());
-
+ tv_jidian.setText("绩点：" + String.format("%.1f", object.getPoint()) + " " + object.getPointChangeName());
+ String pStr = getPaiming(object.getSort());
+ tv_paiming.setText("排名：" + pStr + " " + object.getSortChangeName());
+ pingjia.setText(object.getLeavel());
itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- ReportSceneActivity.getInstance(mContext,object.getSceneId());
+
}
});
-
}
}
- public String getPaiming(float ranking) {
- String s=String.valueOf((int)ranking);
+ public String getPaiming(float ranking) {
+ String s = String.valueOf((int) ranking);
- return "第"+toChinese(s)+"名";
+ return "第" + toChinese(s) + "名";
}
public String toChinese(String string) {
- String[] s1 = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" };
- String[] s2 = { "十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千" };
+ String[] s1 = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
+ String[] s2 = {"十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"};
String result = "";
@@ -85,7 +95,7 @@ public class DeyuDetialAdapter extends BaseRecyclerViewAdapter<DeyuDetialBean> {
} else {
result += s1[num];
}
- System.out.println(" "+result);
+ System.out.println(" " + result);
}
System.out.println("----------------");
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
index e9a8144..8312e90 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java
@@ -2,7 +2,6 @@ package com.shunzhi.parent.adapter;
import android.content.Context;
-import android.content.Intent;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -63,7 +62,7 @@ public class ReportAdapter extends BaseRecyclerViewAdapter<ReportBean> {
deyu_content.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- context.startActivity(new Intent().setClass(context, ReportDetialActivity.class));
+ ReportDetialActivity.getInstance(context,"2018-04-11",2,"34345");
}
});
}
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 80513fa..970a918 100644
--- a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java
+++ b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java
@@ -23,11 +23,11 @@ public interface ReportApi {
@Field("endDate") String endDate);
@FormUrlEncoded
- @POST("api/EvaluationLabel/Getstatisticsanalytical")
+ @POST("api/EvaluationWay/getClassAndStudentCal")
Observable<JsonObject> getReportDetial(@Field("screenId") int screenId,
@Field("schoolId") int SchoolId,
- @Field("objectType") int ObjectType,
- @Field("classId") String classId,
+ @Field("searchType") int ObjectType,
+ @Field("objectId") String classId,
@Field("startDate") String startDate,
@Field("endDate") String endDate);
}
diff --git a/app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java b/app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java
index 0f7971f..de8a31a 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/report/DeyuDetialBean.java
@@ -5,14 +5,29 @@ package com.shunzhi.parent.bean.report;
*/
public class DeyuDetialBean {
- float pointScore;
- String risePoint;
- float ranking;
- String riseRanking;
- String evaluationGrade;
- int sceneId;
+ float point;
+ String pointChangeName;
+ float sort;
+ String sortChangeName;
+ String leavel;
+ int sceneID;
String sceneName;
+ public String getPointChangeName() {
+ return pointChangeName;
+ }
+
+ public void setPointChangeName(String pointChangeName) {
+ this.pointChangeName = pointChangeName;
+ }
+
+ public String getSortChangeName() {
+ return sortChangeName;
+ }
+
+ public void setSortChangeName(String sortChangeName) {
+ this.sortChangeName = sortChangeName;
+ }
public String getSceneName() {
return sceneName;
@@ -22,60 +37,39 @@ public class DeyuDetialBean {
this.sceneName = sceneName;
}
- public float getPointScore() {
- return pointScore;
+ public float getPoint() {
+ return point;
}
- public void setPointScore(float pointScore) {
- this.pointScore = pointScore;
+ public void setPoint(float point) {
+ this.point = point;
}
- public String getRisePoint() {
- return risePoint;
- }
- public void setRisePoint(String risePoint) {
- this.risePoint = risePoint;
- }
- public float getRanking() {
- return ranking;
+ public float getSort() {
+ return sort;
}
- public void setRanking(float ranking) {
- this.ranking = ranking;
+ public void setSort(float sort) {
+ this.sort = sort;
}
- public String getRiseRanking() {
- return riseRanking;
- }
- public void setRiseRanking(String riseRanking) {
- this.riseRanking = riseRanking;
- }
- public String getEvaluationGrade() {
- return evaluationGrade;
+ public String getLeavel() {
+ return leavel;
}
- public void setEvaluationGrade(String evaluationGrade) {
- this.evaluationGrade = evaluationGrade;
+ public void setLeavel(String leavel) {
+ this.leavel = leavel;
}
- public int getSceneId() {
- return sceneId;
+ public int getSceneID() {
+ return sceneID;
}
- public void setSceneId(int sceneId) {
- this.sceneId = sceneId;
+ public void setSceneID(int sceneID) {
+ this.sceneID = sceneID;
}
}
-
-//score":0.0,
-// "pointScore":2.6624999046325684,
-// "risePoint":"同期保持一致",
-// "ranking":1.0,
-// "riseRanking":"与同期保持一致",
-// "evaluationGrade":"E",
-// "sceneId":10,
-// "sceneName":"好人好事"
\ No newline at end of file
diff --git a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
index 78cb14d..3435677 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
@@ -1,5 +1,6 @@
package com.shunzhi.parent.contract.report;
+import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.share.mvpsdk.base.BasePresenter;
import com.share.mvpsdk.base.IBaseModel;
@@ -22,7 +23,8 @@ public interface ReportDetialContract {
Observable<JsonObject> getReportDetialResult(int screenId, int schoolId,String classId,int objectType, String startDate, String endDate);
}
interface IReportDetialView extends IBaseView {
- void showDetialList(List<DeyuDetialBean> list);
+// pointNow,pointPast,sceneName
+ void showDetialList(List<DeyuDetialBean> list, JsonArray pointNow, JsonArray pointPast, JsonArray sceneName);
void showDetialInfo(float rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe);
}
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 82942ef..7f6c6c8 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
@@ -37,15 +37,20 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres
ToastUtils.showToast(jsonObject.toString());
JsonObject data = jsonObject.getAsJsonObject("data");
- String risePoint = data.get("risePoint").getAsString();
- String pointUpAverage = data.get("pointUpAverage").getAsString();
+ String risePoint = data.get("pointChangeName").getAsString();
+ String pointUpAverage = data.get("pointChangeForAveName").getAsString();
+// float ranking = 0.00f;
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 riseRanking = data.get("rankingChangeName").getAsString();
+ String averageRanking = data.get("rankingChangeForAveName").getAsString();
+ String evaluationDescripe = data.get("describe").getAsString();
+// String pscore = "";
+ String pscore = String.format("%.1f", data.get("point").getAsFloat());
- JsonArray reportDetialArray = data.getAsJsonArray("sceneStatistics");
+ JsonArray pointNow = data.getAsJsonArray("pointNow");//今日
+ JsonArray pointPast = data.getAsJsonArray("pointPast");//昨日
+ JsonArray sceneName = data.getAsJsonArray("sceneName");//今日场景
+ JsonArray reportDetialArray = data.getAsJsonArray("sceneNow");
Gson g = new Gson();
List<DeyuDetialBean> list = new ArrayList<>();
Iterator it = reportDetialArray.iterator(); //Iterator处理
@@ -53,10 +58,11 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres
DeyuDetialBean bean = g.fromJson(it.next().toString(), DeyuDetialBean.class); //String转化成JavaBean
list.add(bean); //加入list
}
- mIView.showDetialList(list);
+ mIView.showDetialList(list,pointNow,pointPast,sceneName);
mIView.showDetialInfo(ranking, pscore, risePoint, pointUpAverage, riseRanking, averageRanking, evaluationDescripe);
+
}
}, new Consumer<Throwable>() {
@Override
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportPresenter.java
index 996c7a1..8ab4886 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportPresenter.java
@@ -28,7 +28,6 @@ public class ReportPresenter extends ReportContract.ReportPresenter{
List<ReportBean> list=new ArrayList<>();
ReportBean reportBean=new ReportBean();
list.add(reportBean);
- list.add(reportBean);
mIView.UpdateList(list);
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java
index 072d152..bf393c9 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/report/ReportDetialActivity.java
@@ -20,8 +20,11 @@ import com.shunzhi.parent.ui.fragment.report.ReportDetialFragment;
*/
public class ReportDetialActivity extends BaseMVPCompatActivity implements View.OnClickListener{
- public static void getInstance(Context context) {
+ public static void getInstance(Context context,String day,int schoolId,String objectId ) {
Intent intent = new Intent(context, ReportDetialActivity.class);
+ intent.putExtra("day",day);
+ intent.putExtra("schoolId",schoolId);
+ intent.putExtra("objectId",objectId);
context.startActivity(intent);
}
@@ -35,6 +38,9 @@ public class ReportDetialActivity extends BaseMVPCompatActivity implements View.
ReportDetialFragment reportDetialFragment = null;
+ String day,objectId;
+ int schoolId;
+
@NonNull
@Override
public BasePresenter initPresenter() {
@@ -53,7 +59,14 @@ public class ReportDetialActivity extends BaseMVPCompatActivity implements View.
center_title = findViewById(R.id.center_title);
center_title.setText("德育报告");
ivBack.setOnClickListener(this);
-
+ day=getIntent().getStringExtra("day");
+ objectId=getIntent().getStringExtra("objectId");
+ schoolId = getIntent().getIntExtra("schoolId",0);
+ Bundle bundle=new Bundle();
+ bundle.putString("day",day);
+ bundle.putString("objectId",objectId);
+ bundle.putInt("schoolId",schoolId);
+ reportDetialFragment.setArguments(bundle);
fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.add(R.id.frame_detial, reportDetialFragment)
.show(reportDetialFragment).commit();
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
index 5ac9065..196a3f0 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -16,7 +16,6 @@ import android.widget.TextView;
import com.share.mvpsdk.base.fragment.BaseCompatFragment;
import com.shunzhi.parent.R;
import com.shunzhi.parent.popu.ShaiXuanPop;
-import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
import com.shunzhi.parent.ui.fragment.report.ChengZhangFragment;
import java.util.List;
@@ -86,8 +85,6 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
if (null == shaiXuanPop) shaiXuanPop = new ShaiXuanPop(getActivity());
chengZhangFragment2.showShaixuan(handler);
break;
- case R.id.tvNoData:
- ReportSceneActivity.getInstance(getActivity(), 3);
}
}
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 855571c..8439640 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
@@ -8,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
+import com.google.gson.JsonArray;
import com.share.mvpsdk.base.BasePresenter;
import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
import com.share.mvpsdk.view.chartview.ChartView;
@@ -18,10 +19,7 @@ import com.shunzhi.parent.bean.report.DeyuDetialBean;
import com.shunzhi.parent.contract.report.ReportDetialContract;
import com.shunzhi.parent.presenter.report.ReportDetialPresenter;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
import java.util.List;
/**
@@ -35,10 +33,12 @@ public class ReportDetialFragment extends BaseMVPCompatFragment<ReportDetialCont
private DeyuDetialAdapter deyuDetialAdapter;
List<DeyuDetialBean> deyulist = new ArrayList<>();
- private TextView tv_source, tv_bijiao1, tv_bijiao2, tv_bijiao3, tv_bijiao4, tv_date, tv_ranking, tv_describe;
+ private TextView tv_source, tv_bijiao1, tv_bijiao2, tv_bijiao3, tv_bijiao4, tv_date, tv_ranking, tv_describe, tvToday, tvYesToday, tvChartData;
- private String startDate = "2018-04 -08", endDate = "2018-04-08";
+ private String startDate = "", endDate = "", objectId = "";
+
+ int schoolId;
private ChartView chartView;
@@ -65,23 +65,32 @@ public class ReportDetialFragment extends BaseMVPCompatFragment<ReportDetialCont
tv_date = view.findViewById(R.id.tv_date);
tv_ranking = view.findViewById(R.id.tv_ranking);
tv_describe = view.findViewById(R.id.tv_describe);
- Calendar c = Calendar.getInstance();
- Date date = c.getTime();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- String dateStr = sdf.format(date);
- tv_date.setText(dateStr);
+ tvToday = view.findViewById(R.id.tvToday);
+ tvYesToday = view.findViewById(R.id.tvYesToday);
+ tvChartData = view.findViewById(R.id.tvChartData);
+ tvToday.setText("今日");
+ tvYesToday.setText("昨日");
+
+ startDate = getArguments().getString("day");
+ endDate = getArguments().getString("day");
+ objectId = getArguments().getString("objectId");
+ schoolId = getArguments().getInt("schoolId");
+
+
+ tv_date.setText(startDate);
recycle_deyu.setLayoutManager(new LinearLayoutManager(getActivity()));
deyuDetialAdapter = new DeyuDetialAdapter(getActivity());
recycle_deyu.setAdapter(deyuDetialAdapter);
- initChartViews();
- mPresenter.reportDetialResult(0, 1, "70", 0, startDate, endDate);
+// initChartViews();
+ mPresenter.reportDetialResult(0, schoolId, objectId, 0, startDate, endDate);
+
}
private void initChartViews() {
- chartView.setColors(R.color.textColor, R.color.huodong_blue, R.color.gray);
+ chartView.setColors(R.color.blue, R.color.green, R.color.gray);
List<InputData> inputDataList = new ArrayList<>();
List<InputData> inputDataList1 = new ArrayList<>();
for (int i = 0; i < 7; i++) {
@@ -101,12 +110,41 @@ public class ReportDetialFragment extends BaseMVPCompatFragment<ReportDetialCont
}
@Override
- public void showDetialList(List<DeyuDetialBean> list) {
+ public void showDetialList(List<DeyuDetialBean> list, JsonArray pointNow, JsonArray pointPast, JsonArray sceneName) {
deyulist.clear();
deyulist.addAll(list);
deyuDetialAdapter.addAll(deyulist);
deyuDetialAdapter.notifyDataSetChanged();
-
+ chartView.setColors(R.color.blue, R.color.green, R.color.gray);
+ List<InputData> inputDataListNow = new ArrayList<>();
+
+ List<InputData> inputDataListPast = new ArrayList<>();
+ try {
+
+ InputData inputData0 = new InputData("0", 0);
+ inputDataListNow.add(inputData0);
+ inputDataListPast.add(inputData0);
+ for (int i = 0; i < sceneName.size(); i++) {
+
+ InputData inputData = new InputData(sceneName.get(i).getAsString(), (float) pointNow.get(i).getAsDouble());
+ inputDataListNow.add(inputData);
+
+ InputData inputData1 = new InputData(sceneName.get(i).getAsString(), (float) pointPast.get(i).getAsDouble());
+ inputDataListPast.add(inputData1);
+
+ }
+ if (inputDataListNow.size()>0){
+ tvChartData.setVisibility(View.GONE);
+ chartView.setVisibility(View.VISIBLE);
+ chartView.setChartPaths(inputDataListNow);
+ chartView.setChartPaths(inputDataListPast);
+ }else {
+ tvChartData.setVisibility(View.VISIBLE);
+ chartView.setVisibility(View.GONE);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
index f2ee2b6..9852083 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ReportSceneFragment.java
@@ -6,7 +6,6 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -36,7 +35,7 @@ public class ReportSceneFragment extends BaseMVPCompatFragment<ReportSceneContra
private TextView tv_rank, tv_scoree, tv_pscoree,tv_sceneName;
private ChartView chartView;
- String startData="2018-04-03",endData="2018-04-03",objectId="102697";
+ String startData="",endData="",objectId="";
int schoolId=1,sceneId;
@NonNull
@@ -77,31 +76,32 @@ public class ReportSceneFragment extends BaseMVPCompatFragment<ReportSceneContra
@Override
public void showChart(List<ChatBean> list1, List<ChatBean> list2, List<ChatBean> list3) {
- Log.e("11111", "1111----====");
if(list1==null||list2==null||list3==null) {
- Log.e("11111", "----====");
return ;
}
chartView.setColors(R.color.textColor, R.color.huodong_blue, R.color.gray);
List<InputData> inputDataList1 = new ArrayList<>();
List<InputData> inputDataList2 = new ArrayList<>();
List<InputData> inputDataList3 = new ArrayList<>();
+ inputDataList1.add(new InputData("0",0));
+ inputDataList2.add(new InputData("0",0));
+ inputDataList3.add(new InputData("0",0));
for (int i = 0; i < list1.size(); i++) {
- InputData inputData = new InputData(list1.get(i).getDate(), (long)list1.get(i).getGap());
+ InputData inputData = new InputData(list1.get(i).getDate(), list1.get(i).getGap());
inputDataList1.add(inputData);
}
chartView.setChartPaths(inputDataList1);
for (int i = 0; i < list2.size(); i++) {
- InputData inputData = new InputData(list2.get(i).getDate(), (long)list2.get(i).getGap());
+ InputData inputData = new InputData(list2.get(i).getDate(), list2.get(i).getGap());
inputDataList2.add(inputData);
}
chartView.setChartPaths(inputDataList2);
for (int i = 0; i <list3.size(); i++) {
- InputData inputData = new InputData(list3.get(i).getDate(),(long) list3.get(i).getGap());
+ InputData inputData = new InputData(list3.get(i).getDate(), list3.get(i).getGap());
inputDataList3.add(inputData);
}
diff --git a/app/src/main/res/drawable/shape_blue_8.xml b/app/src/main/res/drawable/shape_blue_8.xml
new file mode 100644
index 0000000..b5314b5
--- /dev/null
+++ b/app/src/main/res/drawable/shape_blue_8.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <corners android:radius="@dimen/size_dp_8"/>
+
+ <solid android:color="@color/blue"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_green_circle.xml b/app/src/main/res/drawable/shape_green_circle.xml
new file mode 100644
index 0000000..b5be3eb
--- /dev/null
+++ b/app/src/main/res/drawable/shape_green_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <corners android:radius="@dimen/size_dp_8"/>
+ <solid android:color="@color/green"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index ea22c27..aed0799 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -69,7 +69,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
- android:visibility="visible"
+ android:visibility="gone"
>
diff --git a/app/src/main/res/layout/fragment_report_detial.xml b/app/src/main/res/layout/fragment_report_detial.xml
index 8cb8b72..d0fb310 100644
--- a/app/src/main/res/layout/fragment_report_detial.xml
+++ b/app/src/main/res/layout/fragment_report_detial.xml
@@ -168,38 +168,97 @@
</LinearLayout>
- <FrameLayout
+ <android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/size_dp_10">
+ android:layout_height="0dp"
+ android:layout_weight="1.5">
- <com.share.mvpsdk.view.chartview.ChartView
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/chartView"
- />
+ android:orientation="vertical">
- <TextView
- android:visibility="gone"
- android:layout_width="match_parent"
- android:layout_height="200dp"
- android:text="图表控件"
- android:layout_gravity="center"
- android:gravity="center"
- android:textColor="@color/md_red_500"
- android:background="@color/huodong_blue" />
+ <LinearLayout
+ android:layout_marginTop="@dimen/size_dp_10"
+ android:layout_marginBottom="@dimen/size_dp_10"
+ android:gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ >
+
+ <TextView
+ android:layout_width="@dimen/size_dp_16"
+ android:layout_height="@dimen/size_dp_16"
+ android:background="@drawable/shape_blue_8"
+ />
- </FrameLayout>
+ <TextView
+ android:layout_marginLeft="@dimen/size_dp_5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="今日"
+ android:id="@+id/tvToday"
+ android:textSize="@dimen/size_dp_16"
+ android:textColor="@color/textColor"
+ />
+ <TextView
+ android:layout_marginLeft="@dimen/size_dp_25"
+ android:layout_width="@dimen/size_dp_16"
+ android:layout_height="@dimen/size_dp_16"
+ android:background="@drawable/shape_green_circle"
+ />
- <android.support.v7.widget.RecyclerView
- android:id="@+id/recycle_deyu"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/size_dp_10"
- android:background="@color/bgColor">
+ <TextView
+ android:layout_marginLeft="@dimen/size_dp_5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="昨日"
+ android:id="@+id/tvYesToday"
+ android:textSize="@dimen/size_dp_16"
+ android:textColor="@color/textColor"
+ />
+
+ </LinearLayout>
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/size_dp_200"
+ android:layout_marginTop="@dimen/size_dp_10">
+
+ <com.share.mvpsdk.view.chartview.ChartView
+ android:id="@+id/chartView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:background="@color/blue"
+ android:textSize="@dimen/size_dp_18"
+ android:gravity="center"
+ android:text="暂无图表数据"
+ android:id="@+id/tvChartData"
+ android:textColor="@color/textColor"
+ android:visibility="gone" />
+
+ </FrameLayout>
+
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/recycle_deyu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/size_dp_10"
+ android:background="@color/bgColor">
+
+ </android.support.v7.widget.RecyclerView>
+
+
+ </LinearLayout>
- </android.support.v7.widget.RecyclerView>
+ </android.support.v4.widget.NestedScrollView>
</LinearLayout>
diff --git a/app/src/main/res/layout/item_deyu_detial.xml b/app/src/main/res/layout/item_deyu_detial.xml
index 848a32f..1f6a129 100644
--- a/app/src/main/res/layout/item_deyu_detial.xml
+++ b/app/src/main/res/layout/item_deyu_detial.xml
@@ -30,13 +30,13 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/jidian"
+ android:id="@+id/tv_jidian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绩点：4.3 增长1.1分" />
<TextView
android:layout_marginLeft="10dp"
- android:id="@+id/paiming"
+ android:id="@+id/tv_paiming"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="排名：第三名 增长1名" />
@@ -47,7 +47,7 @@
<TextView
- android:id="@+id/pingjia"
+ android:id="@+id/tv_pingjia"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 57ec076..26671fd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,8 @@
<color name="hintTextColor">#494947</color>
<color name="bottomline">#B8B8B9</color>
<color name="bg_main">#F0EFF5</color>
-
+ <color name="blue">#2956FE</color>
+ <color name="green">#00CB87</color>
<color name="back_top">#A6DAFF</color>
<color name="textBlue">#ACC9FC</color>
<color name="titleColor">#A6DAFF</color>
--
libgit2 0.21.0