From 62c9d9b19f785dea98950065eb5943573e3a5903 Mon Sep 17 00:00:00 2001 From: lh <1209405678@qq.com> Date: Sat, 24 Feb 2018 11:32:37 +0800 Subject: [PATCH] no message --- .../main/java/com/qhclh/ytzh/home/RpcUrl.java | 2 + .../breedpoultry/DatanalysisActivity.java | 41 ++++++++++--------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java index 89f6021..9b1355a 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java +++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java @@ -94,6 +94,8 @@ public class RpcUrl { public static String DetailListView ="/MainSystem/B3_ZhongHui/Rpcs/DayProductReportRpc/DetailListView"; public static String DetailListView_fanhui ="/MainSystem/B3PoultryBreed/BO/DayProduct_Detail"; + public static String HouseView ="/MainSystem/B3_ZhongHui/Rpcs/DayProductReportRpc/HouseView"; + } diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java index 93fcc72..c0bc45a 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java @@ -39,6 +39,8 @@ public class DatanalysisActivity extends BaseActivity { @BindView(R.id.line_chart) LineChartView lineChart; + private long house_id; + ///< 横坐标 private List mAxisXValuesList = new ArrayList(); ///< 横坐标 @@ -53,9 +55,9 @@ public class DatanalysisActivity extends BaseActivity { List listshuju = new ArrayList(); Float[] score;//图表的数据 ///< 基准线数据 - Float[] score1; +// Float[] score1; ///< 获取到的基准线值 - private List listjizhun = new ArrayList(); +// private List listjizhun = new ArrayList(); @Override protected int setLayoutId() { return R.layout.act_datanalysis; @@ -73,12 +75,13 @@ public class DatanalysisActivity extends BaseActivity { @Override protected void initData() { + house_id = getIntent().getLongExtra("id",0); System.out.println("aaa+++dddd++++"+getIntent().getLongExtra("id",0)); taget_content1.setText("20\t\t10\t\t15"); for (int i=1;i<15;i++){ hengzuobiaolist.add("第"+i+"天"); - listshuju.add(i+111.1f); - listjizhun.add(i+112.2f); + listshuju.add(i+1.111f); +// listjizhun.add(i+112.2f); } ///< 横坐标数据 @@ -90,8 +93,8 @@ public class DatanalysisActivity extends BaseActivity { score = (Float[]) listshuju.toArray(new Float[length]); ///< 基准 标准 - int size = listjizhun.size(); - score1 = (Float[]) listjizhun.toArray(new Float[size]); +// int size = listjizhun.size(); +// score1 = (Float[]) listjizhun.toArray(new Float[size]); getAxisXLables();//获取x轴的标注 getAxisPoints();//获取坐标点 @@ -145,9 +148,9 @@ public class DatanalysisActivity extends BaseActivity { for (int i = 0; i < score.length; i++) { mPointValuesList.add(new PointValue(i, score[i])); } - for (int i = 0; i < score1.length; i++) { - mPointValuesList1.add(new PointValue(i, score1[i])); - } +// for (int i = 0; i < score1.length; i++) { +// mPointValuesList1.add(new PointValue(i, score1[i])); +// } } /** @@ -157,29 +160,29 @@ public class DatanalysisActivity extends BaseActivity { ///< 数据 Line line = new Line(mPointValuesList).setColor(Color.parseColor("#336699")); //折线的颜色 ///< 标准线 - Line line1 = new Line(mPointValuesList1).setColor(Color.parseColor("#2eab71")); //折线的颜色 +// Line line1 = new Line(mPointValuesList1).setColor(Color.parseColor("#2eab71")); //折线的颜色 List lines = new ArrayList(); line.setShape(ValueShape.CIRCLE);//折线图上每个数据点的形状 这里是圆形 （有三种 ：ValueShape.SQUARE ValueShape.CIRCLE ValueShape.DIAMOND） - line1.setShape(ValueShape.CIRCLE);//折线图上每个数据点的形状 这里是圆形 （有三种 ：ValueShape.SQUARE ValueShape.CIRCLE ValueShape.DIAMOND） +// line1.setShape(ValueShape.CIRCLE);//折线图上每个数据点的形状 这里是圆形 （有三种 ：ValueShape.SQUARE ValueShape.CIRCLE ValueShape.DIAMOND） line.setCubic(false);//曲线是否平滑 - line1.setCubic(false);//曲线是否平滑 +// line1.setCubic(false);//曲线是否平滑 line.setStrokeWidth(2);//线条的粗细，默认是3 - line1.setStrokeWidth(1);//线条的粗细，默认是3 +// line1.setStrokeWidth(1);//线条的粗细，默认是3 line.setFilled(false);//是否填充曲线的面积 - line1.setFilled(false);//是否填充曲线的面积 +// line1.setFilled(false);//是否填充曲线的面积 line.setHasLabels(true);//曲线的数据坐标是否加上备注 - line1.setHasLabels(false);//曲线的数据坐标是否加上备注 +// line1.setHasLabels(false);//曲线的数据坐标是否加上备注 // line.setHasLabelsOnlyForSelected(true);//点击数据坐标提示数据（设置了这个line.setHasLabels(true);就无效） line.setHasLines(true);//是否用直线显示。如果为false 则没有曲线只有点显示 - line1.setHasLines(true);//是否用直线显示。如果为false 则没有曲线只有点显示 +// line1.setHasLines(true);//是否用直线显示。如果为false 则没有曲线只有点显示 line.setHasPoints(true);//是否显示圆点 如果为false 则没有原点只有点显示 - line1.setHasPoints(false);//是否显示圆点 如果为false 则没有原点只有点显示 +// line1.setHasPoints(false);//是否显示圆点 如果为false 则没有原点只有点显示 LineChartValueFormatter chartValueFormatter = new SimpleLineChartValueFormatter(2); line.setFormatter(chartValueFormatter);//显示小数点 - line1.setFormatter(chartValueFormatter);//显示小数点 +// line1.setFormatter(chartValueFormatter);//显示小数点 lines.add(line); - lines.add(line1); +// lines.add(line1); LineChartData data = new LineChartData(); data.setLines(lines);