From 416f42efc169d0a7189a2c5b66dafcb2ac34a594 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Tue, 20 Aug 2019 16:29:48 +0800 Subject: [PATCH] enviroment --- .../fragmemt/EnvironmentFragment.java | 60 +++++ .../oldpeople/fragmemt/HeartRateFragment.java | 13 +- .../oldpeoplehome/utils/ChartUtils.java | 8 +- .../app/src/main/res/drawable/ic_humidity.xml | 5 + .../src/main/res/drawable/ic_temperature.xml | 4 + .../res/layout/fragment_old_environment.xml | 218 +++++++++++++++++- .../app/src/main/res/values/colors.xml | 2 +- android/图标/温度.svg | 1 + android/图标/湿度.svg | 1 + 9 files changed, 295 insertions(+), 17 deletions(-) create mode 100644 android/OldPeopleHome/app/src/main/res/drawable/ic_humidity.xml create mode 100644 android/OldPeopleHome/app/src/main/res/drawable/ic_temperature.xml create mode 100644 android/图标/温度.svg create mode 100644 android/图标/湿度.svg diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java index 5baf798..4454861 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java @@ -1,15 +1,39 @@ package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt; +import android.os.Bundle; import android.os.Handler; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; +import com.github.mikephil.charting.charts.LineChart; +import com.github.mikephil.charting.data.Entry; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; +import com.scorpiomiku.oldpeoplehome.utils.ChartUtils; + +import java.util.ArrayList; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; /** * Created by ScorpioMiku on 2019/8/18. */ public class EnvironmentFragment extends BaseFragment { + @BindView(R.id.temperature_text) + TextView temperatureText; + @BindView(R.id.humidity_text) + TextView humidityText; + @BindView(R.id.temperature_chart) + LineChart temperatureChart; + @BindView(R.id.humidity_chart) + LineChart humidityChart; + Unbinder unbinder; + @Override protected Handler initHandle() { return null; @@ -27,6 +51,42 @@ public class EnvironmentFragment extends BaseFragment { @Override protected void initView() { + initChart(); + } + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + // TODO: inflate a fragment view + View rootView = super.onCreateView(inflater, container, savedInstanceState); + unbinder = ButterKnife.bind(this, rootView); + return rootView; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + /** + * 初始化Chart + */ + private void initChart() { + ArrayList temperatureValues = new ArrayList<>(); + float[] temperature = {20f, 90f, 60f, 88f}; + temperatureValues.add(new Entry(0, 0)); + for (int i = 0; i < temperature.length; i++) { + temperatureValues.add(new Entry(i + 1, temperature[i])); + } + ChartUtils.initSingleLineChart(temperatureChart, temperatureValues, "近15天平均温度", 0xFF01B67A); + + + ArrayList humidityValues = new ArrayList<>(); + float[] levels = {20f, 90f, 60f, 88f}; + humidityValues.add(new Entry(0, 0)); + for (int i = 0; i < levels.length; i++) { + humidityValues.add(new Entry(i + 1, levels[i])); + } + ChartUtils.initSingleLineChart(humidityChart, humidityValues, "近15天平均湿度", 0xFF01B67A); } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java index 0838f57..39356b2 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java @@ -75,16 +75,13 @@ public class HeartRateFragment extends BaseFragment { */ private void initChart() { ArrayList pointValues = new ArrayList<>(); - pointValues.add(new Entry(0, 100)); - ArrayList data = new ArrayList<>(); int i; - float[] levels = {2f, 90f, 60f, 88f}; - for (i = 1; i <= levels.length - 1; i++) { - pointValues.add(new Entry(i, Float.valueOf(levels[i]))); - data.add(Float.valueOf(levels[i])); + float[] levels = {20f, 90f, 60f, 88f, 100f}; + pointValues.add(new Entry(0, 0)); + for (i = 0; i < levels.length; i++) { + pointValues.add(new Entry(i + 1, levels[i])); } - pointValues.add(new Entry(i, 0)); - ChartUtils.initSingleLineChart(chart, pointValues, "心率统计图"); + ChartUtils.initSingleLineChart(chart, pointValues, "近15天平均心率", 0xFFF56EC0); } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java index 4c5d3f2..bea939f 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java @@ -33,13 +33,13 @@ public class ChartUtils { * @param linename * @return */ - public static void initSingleLineChart(LineChart mLineChart, List list, String linename) { + public static void initSingleLineChart(LineChart mLineChart, List list, String linename,int fillColor) { LineDataSet dataSet = new LineDataSet(list, "Label"); // add entries to dataset - dataSet.setColor(Color.parseColor("#d63f9c"));//线条颜色 + dataSet.setColor(fillColor);//线条颜色 dataSet.setCircleColor(Color.parseColor("#7d7d7d"));//圆点颜色 dataSet.setDrawFilled(true); - dataSet.setFillColor(0xFFF56EC0); + dataSet.setFillColor(fillColor); dataSet.setLineWidth(1f);//线条宽度 //设置样式 @@ -73,7 +73,7 @@ public class ChartUtils { //隐藏x轴描述 Description description = new Description(); - description.setText("近15天平均心率"); + description.setText(linename); description.setTextSize(12f); // description.setTextColor(0x000); description.setTextColor(Color.WHITE); diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_humidity.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_humidity.xml new file mode 100644 index 0000000..55da3ba --- /dev/null +++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_humidity.xml @@ -0,0 +1,5 @@ + + + + diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_temperature.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_temperature.xml new file mode 100644 index 0000000..ad4b3de --- /dev/null +++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_temperature.xml @@ -0,0 +1,4 @@ + + + diff --git a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_environment.xml b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_environment.xml index e18aecf..65d718b 100644 --- a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_environment.xml +++ b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_environment.xml @@ -1,12 +1,222 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/OldPeopleHome/app/src/main/res/values/colors.xml b/android/OldPeopleHome/app/src/main/res/values/colors.xml index 9a0f27b..73d7dac 100644 --- a/android/OldPeopleHome/app/src/main/res/values/colors.xml +++ b/android/OldPeopleHome/app/src/main/res/values/colors.xml @@ -8,7 +8,7 @@ #e66d4a #3d4eca #d63f9c - #5adeb2 + #2fb689 #dfdede diff --git a/android/图标/温度.svg b/android/图标/温度.svg new file mode 100644 index 0000000..fad93f4 --- /dev/null +++ b/android/图标/温度.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/android/图标/湿度.svg b/android/图标/湿度.svg new file mode 100644 index 0000000..47b9179 --- /dev/null +++ b/android/图标/湿度.svg @@ -0,0 +1 @@ + \ No newline at end of file