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 08c6570..76aa5d2 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 @@ -96,7 +96,7 @@ public class DatanalysisActivity extends BaseActivity { @Override protected void initData() { house_id = getIntent().getLongExtra("id",0); - HouseView("死淘","#da4848"); + HouseView("死淘","#da4848",0); } @@ -104,22 +104,22 @@ public class DatanalysisActivity extends BaseActivity { public void OnClick(View view){ switch (view.getId()){ case R.id.lldl_sitao: - HouseView("死淘","#da4848"); + HouseView("死淘","#da4848",0); break; case R.id.lldl_tizhong: - HouseView("体重","#d16ee3"); + HouseView("体重","#d16ee3",2); break; case R.id.lldl_yinshui: - HouseView("饮水","#e6d621"); + HouseView("饮水","#e6d621",2); break; } } - private void HouseView(final String item, final String color) { + private void HouseView(final String item, final String color,final int decimal) { ViewOnClickTask HouseViewTask = new ViewOnClickTask(this,"加载中...") { List rpobj; @Override @@ -154,7 +154,7 @@ public class DatanalysisActivity extends BaseActivity { getAxisXLables();//获取x轴的标注 getAxisPoints();//获取坐标点 - initLineChart(color);//初始化 + initLineChart(color,decimal);//初始化 } @Override @@ -222,7 +222,7 @@ public class DatanalysisActivity extends BaseActivity { /** * 初始化LineChart的一些设置 */ - private void initLineChart(String color) { + private void initLineChart(String color,int decimal) { ///< 数据 Line line = new Line(mPointValuesList).setColor(Color.parseColor(color)); //折线的颜色 ///< 标准线 @@ -244,8 +244,13 @@ public class DatanalysisActivity extends BaseActivity { // line1.setHasLines(true);//是否用直线显示。如果为false 则没有曲线只有点显示 line.setHasPoints(true);//是否显示圆点 如果为false 则没有原点只有点显示 // line1.setHasPoints(false);//是否显示圆点 如果为false 则没有原点只有点显示 - LineChartValueFormatter chartValueFormatter = new SimpleLineChartValueFormatter(2); - line.setFormatter(chartValueFormatter);//显示小数点 + LineChartValueFormatter chartValueFormatter0 = new SimpleLineChartValueFormatter(0); + LineChartValueFormatter chartValueFormatter2 = new SimpleLineChartValueFormatter(2); + if (decimal == 0 ) { + line.setFormatter(chartValueFormatter0);//显示小数点 + }else if (decimal == 2) { + line.setFormatter(chartValueFormatter2);//显示小数点 + } // line1.setFormatter(chartValueFormatter);//显示小数点 lines.add(line); // lines.add(line1); @@ -254,7 +259,7 @@ public class DatanalysisActivity extends BaseActivity { //坐标轴 Axis axisX = new Axis(); //X轴 - axisX.setHasTiltedLabels(false); //X轴下面坐标轴字体是斜的显示还是直的,true是斜的显示 + axisX.setHasTiltedLabels(true); //X轴下面坐标轴字体是斜的显示还是直的,true是斜的显示 // axisX.setTextColor(Color.WHITE); //设置字体颜色 axisX.setTextColor(Color.parseColor("#336699")); @@ -263,6 +268,7 @@ public class DatanalysisActivity extends BaseActivity { axisX.setTextSize(11);//设置字体大小 axisX.setMaxLabelChars(6); //最多几个X轴坐标,意思就是你的缩放让X轴上数据的个数7<=x<=mAxisValues.length axisX.setValues(mAxisXValuesList); //填充X轴的坐标名称 + axisX.setHasLines(true); //x 轴分割线 data.setAxisXBottom(axisX); //x 轴在底部 //// data.setAxisXTop(axisX); //x 轴在顶部 // axisX.setHasLines(true); //x 轴分割线