From e9dc97ac01bb2e03c99be5c449d3d02745bc5a7d Mon Sep 17 00:00:00 2001 From: lh <1209405678@qq.com> Date: Thu, 30 Nov 2017 17:25:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_mine_info.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_mine_info.xml b/app/src/main/res/layout/activity_mine_info.xml index 3cf5b92..6a2291c 100644 --- a/app/src/main/res/layout/activity_mine_info.xml +++ b/app/src/main/res/layout/activity_mine_info.xml @@ -84,7 +84,10 @@ android:paddingRight="12dp" android:text="性别" android:textSize="@dimen/text_size_18" /> - + Date: Fri, 1 Dec 2017 10:12:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/shape_balck.xml | 12 ++ app/src/main/res/drawable/shape_blue.xml | 12 ++ app/src/main/res/drawable/shape_green.xml | 12 ++ app/src/main/res/drawable/shape_perpo.xml | 12 ++ app/src/main/res/drawable/shape_red1.xml | 12 ++ app/src/main/res/drawable/shape_white.xml | 12 ++ app/src/main/res/layout/act_datanalysis.xml | 176 +++++++++++++++++++- app/src/main/res/values/colors.xml | 4 + app/src/main/res/values/strings.xml | 6 + 9 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/shape_balck.xml create mode 100644 app/src/main/res/drawable/shape_blue.xml create mode 100644 app/src/main/res/drawable/shape_green.xml create mode 100644 app/src/main/res/drawable/shape_perpo.xml create mode 100644 app/src/main/res/drawable/shape_red1.xml create mode 100644 app/src/main/res/drawable/shape_white.xml diff --git a/app/src/main/res/drawable/shape_balck.xml b/app/src/main/res/drawable/shape_balck.xml new file mode 100644 index 0000000..ac72f85 --- /dev/null +++ b/app/src/main/res/drawable/shape_balck.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_blue.xml b/app/src/main/res/drawable/shape_blue.xml new file mode 100644 index 0000000..3aaf085 --- /dev/null +++ b/app/src/main/res/drawable/shape_blue.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_green.xml b/app/src/main/res/drawable/shape_green.xml new file mode 100644 index 0000000..e1b3c6c --- /dev/null +++ b/app/src/main/res/drawable/shape_green.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_perpo.xml b/app/src/main/res/drawable/shape_perpo.xml new file mode 100644 index 0000000..073996d --- /dev/null +++ b/app/src/main/res/drawable/shape_perpo.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_red1.xml b/app/src/main/res/drawable/shape_red1.xml new file mode 100644 index 0000000..6b79d3f --- /dev/null +++ b/app/src/main/res/drawable/shape_red1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_white.xml b/app/src/main/res/drawable/shape_white.xml new file mode 100644 index 0000000..11cd961 --- /dev/null +++ b/app/src/main/res/drawable/shape_white.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/act_datanalysis.xml b/app/src/main/res/layout/act_datanalysis.xml index d6cb79d..e63bd6e 100644 --- a/app/src/main/res/layout/act_datanalysis.xml +++ b/app/src/main/res/layout/act_datanalysis.xml @@ -1,8 +1,180 @@ + android:layout_height="match_parent" + android:background="@color/white" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8ab6ebd..a8e42d1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -31,5 +31,9 @@ #00000000 #02aa3e + #da4848 + #48dac7 + #48da59 + #d26ee4 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 920115f..e91ab94 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,5 +33,11 @@ 鸡苗 毛鸡 饲料 + 标准 + 死亡 + 体重 + 死淘 + 对比项 + 显示内容 From 5a34ccf0eeaa18775e8c847a24f649ca83bd80af Mon Sep 17 00:00:00 2001 From: lh <1209405678@qq.com> Date: Fri, 1 Dec 2017 10:45:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../breedpoultry/DatanalysisActivity.java | 161 ++++++++++++++++++ 1 file changed, 161 insertions(+) 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 e356f1a..a43729b 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 @@ -1,15 +1,31 @@ package com.qhclh.ytzh.work.breedpoultry; import android.content.Intent; +import android.graphics.Color; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.widget.TextView; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; +import java.util.ArrayList; +import java.util.List; + import butterknife.BindView; +import lecho.lib.hellocharts.formatter.LineChartValueFormatter; +import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter; +import lecho.lib.hellocharts.gesture.ZoomType; +import lecho.lib.hellocharts.model.Axis; +import lecho.lib.hellocharts.model.AxisValue; +import lecho.lib.hellocharts.model.Line; +import lecho.lib.hellocharts.model.LineChartData; +import lecho.lib.hellocharts.model.PointValue; +import lecho.lib.hellocharts.model.ValueShape; +import lecho.lib.hellocharts.model.Viewport; +import lecho.lib.hellocharts.view.LineChartView; /** * Created by 青花瓷 on 2017/11/30. @@ -18,6 +34,28 @@ import butterknife.BindView; public class DatanalysisActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; + @BindView(R.id.taget_content1) + TextView taget_content1; + @BindView(R.id.line_chart) + LineChartView lineChart; + + ///< 横坐标 + private List mAxisXValuesList = new ArrayList(); + ///< 横坐标 + List hengzuobiaolist = new ArrayList<>(); + String[] date;//X轴的标注 + ///< 指标数据 + private List mPointValuesList = new ArrayList(); + ///< 基准线 标准线 + private List mPointValuesList1 = new ArrayList(); + + ///< 指标数据 + List listshuju = new ArrayList(); + Float[] score;//图表的数据 + ///< 基准线数据 + Float[] score1; + ///< 获取到的基准线值 + private List listjizhun = new ArrayList(); @Override protected int setLayoutId() { return R.layout.act_datanalysis; @@ -35,7 +73,28 @@ public class DatanalysisActivity extends BaseActivity { @Override protected void initData() { + taget_content1.setText("20\t\t10\t\t15"); + for (int i=0;i<7;i++){ + hengzuobiaolist.add("第"+i+"天"); + listshuju.add(i+1.0f); + listjizhun.add(i+2.0f); + } + + ///< 横坐标数据 + int lenth = hengzuobiaolist.size(); + date = hengzuobiaolist.toArray(new String[lenth]); + + ///< 批次数据 + int length = listshuju.size(); + score = (Float[]) listshuju.toArray(new Float[length]); + ///< 基准 标准 + int size = listjizhun.size(); + score1 = (Float[]) listjizhun.toArray(new Float[size]); + + getAxisXLables();//获取x轴的标注 + getAxisPoints();//获取坐标点 + initLineChart();//初始化 } @Override @@ -60,4 +119,106 @@ public class DatanalysisActivity extends BaseActivity { } return super.onOptionsItemSelected(item); } + + /** + * X 轴的显示 + */ + private void getAxisXLables() { + mAxisXValuesList.clear(); + for (int i = 0; i < date.length; i++) { + mAxisXValuesList.add(new AxisValue(i).setLabel(date[i])); + } + } + + /** + * 图表的每个点的显示 + */ + private void getAxisPoints() { + mPointValuesList.clear(); + mPointValuesList1.clear(); + 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])); + } + } + + /** + * 初始化LineChart的一些设置 + */ + private void initLineChart() { + ///< 数据 + Line line = new Line(mPointValuesList).setColor(Color.parseColor("#336699")); //折线的颜色 + ///< 标准线 + 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） + line.setCubic(false);//曲线是否平滑 + line1.setCubic(false);//曲线是否平滑 +// line.setStrokeWidth(3);//线条的粗细，默认是3 + line1.setStrokeWidth(1);//线条的粗细，默认是3 + line.setFilled(false);//是否填充曲线的面积 + line1.setFilled(false);//是否填充曲线的面积 + line.setHasLabels(true);//曲线的数据坐标是否加上备注 + line1.setHasLabels(false);//曲线的数据坐标是否加上备注 +// line.setHasLabelsOnlyForSelected(true);//点击数据坐标提示数据（设置了这个line.setHasLabels(true);就无效） + line.setHasLines(true);//是否用直线显示。如果为false 则没有曲线只有点显示 + line1.setHasLines(true);//是否用直线显示。如果为false 则没有曲线只有点显示 + line.setHasPoints(true);//是否显示圆点 如果为false 则没有原点只有点显示 + line1.setHasPoints(false);//是否显示圆点 如果为false 则没有原点只有点显示 + LineChartValueFormatter chartValueFormatter = new SimpleLineChartValueFormatter(2); + line.setFormatter(chartValueFormatter);//显示小数点 + line1.setFormatter(chartValueFormatter);//显示小数点 + lines.add(line); + lines.add(line1); + LineChartData data = new LineChartData(); + data.setLines(lines); + + //坐标轴 + Axis axisX = new Axis(); //X轴 + axisX.setHasTiltedLabels(false); //X轴下面坐标轴字体是斜的显示还是直的，true是斜的显示 + axisX.setTextColor(Color.WHITE); //设置字体颜色 + axisX.setTextColor(Color.parseColor("#336699"));//灰色 + + +// axisX.setName(hengzuobiao); //表格名称 + axisX.setTextSize(11);//设置字体大小 + axisX.setMaxLabelChars(6); //最多几个X轴坐标，意思就是你的缩放让X轴上数据的个数7<=x<=mAxisValues.length + axisX.setValues(mAxisXValuesList); //填充X轴的坐标名称 + data.setAxisXBottom(axisX); //x 轴在底部 +//// data.setAxisXTop(axisX); //x 轴在顶部 +// axisX.setHasLines(true); //x 轴分割线 +// +// + Axis axisY = new Axis(); //Y轴 +// axisY.setName(zongzuobiao);//y轴标注 + axisY.setTextSize(11);//设置字体大小 + data.setAxisYLeft(axisY); //Y轴设置在左边 + //data.setAxisYRight(axisY); //y轴设置在右边 + + //设置行为属性，支持缩放、滑动以及平移 + lineChart.setInteractive(true); + lineChart.setZoomType(ZoomType.HORIZONTAL); //缩放类型，水平 + lineChart.setMaxZoom((float) 10);//缩放比例 + lineChart.setLineChartData(data); + lineChart.setVisibility(View.VISIBLE); + /**注：下面的7，10只是代表一个数字去类比而已 + * 尼玛搞的老子好辛苦！！！见（http://forum.xda-developers.com/tools/programming/library-hellocharts-charting-library-t2904456/page2）; + * 下面几句可以设置X轴数据的显示个数（x轴0-7个数据），当数据点个数小于（29）的时候，缩小到极致hellochart默认的是所有显示。当数据点个数大于（29）的时候， + * 若不设置axisX.setMaxLabelChars(int count)这句话,则会自动适配X轴所能显示的尽量合适的数据个数。 + * 若设置axisX.setMaxLabelChars(int count)这句话, + * 33个数据点测试，若 axisX.setMaxLabelChars(10);里面的10大于v.right= 7; 里面的7，则 + 刚开始X轴显示7条数据，然后缩放的时候X轴的个数会保证大于7小于10 + 若小于v.right= 7;中的7,反正我感觉是这两句都好像失效了的样子 - -! + * 并且Y轴是根据数据的大小自动设置Y轴上限 + * 若这儿不设置 v.right= 7; 这句话，则图表刚开始就会尽可能的显示所有数据，交互性太差 + */ + Viewport v = new Viewport(lineChart.getMaximumViewport()); + v.left = 0; + v.right = 6; + lineChart.setCurrentViewport(v); + } } From b3a78ac5d281ea000de7a87cae6455fab851cd8f Mon Sep 17 00:00:00 2001 From: lh <1209405678@qq.com> Date: Fri, 1 Dec 2017 15:50:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../breedpoultry/DatanalysisSActivity.java | 25 ++ app/src/main/res/layout/act_datanaly_s.xml | 308 +++++++++++++++++- app/src/main/res/values/strings.xml | 14 + 3 files changed, 346 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java index a24a8fb..59855f2 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java @@ -2,7 +2,10 @@ package com.qhclh.ytzh.work.breedpoultry; import android.support.v7.widget.Toolbar; import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.GridView; +import android.widget.Spinner; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; @@ -22,8 +25,12 @@ public class DatanalysisSActivity extends BaseActivity { Toolbar mToolbar; @BindView(R.id.gv_dataanaly) GridView gv_dataanaly; + @BindView(R.id.buildinghome) + Spinner buildinghome; private List factryBeanList; private FactryAdapter factryAdapter; + private List list = new ArrayList(); + private List factryCheck; @Override @@ -53,10 +60,28 @@ public class DatanalysisSActivity extends BaseActivity { } factryAdapter = new FactryAdapter(this,factryBeanList,factryCheck); gv_dataanaly.setAdapter(factryAdapter); + + list.add("苹果"); + list.add("香蕉"); + list.add("橘子"); + list.add("香蕉"); + ArrayAdapter adapter=new ArrayAdapter(this, android.R.layout.simple_spinner_item,list); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + buildinghome.setAdapter(adapter); } @Override protected void initOper() { + buildinghome.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + + } + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); } } diff --git a/app/src/main/res/layout/act_datanaly_s.xml b/app/src/main/res/layout/act_datanaly_s.xml index 915ef90..5e34e9d 100644 --- a/app/src/main/res/layout/act_datanaly_s.xml +++ b/app/src/main/res/layout/act_datanaly_s.xml @@ -9,7 +9,8 @@ + android:layout_height="match_parent" + android:scrollbars="none"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +