From b22d5ad1aa2e1f49f7a75df2fa06a762f85b61b0 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Wed, 4 Sep 2019 15:16:38 +0800 Subject: [PATCH] 15:16 --- android/OldPeopleHome/.idea/workspace.xml | 539 ++++++++++-------- .../fragmemt/EnvironmentFragment.java | 31 +- .../oldpeople/fragmemt/HeartRateFragment.java | 35 +- .../oldpeople/fragmemt/SleepFragment.java | 4 + .../fragmemt/SleepViewPagerItem.java | 2 + .../oldpeople/fragmemt/StepFragment.java | 6 +- .../oldpeoplehome/utils/ChartUtils.java | 11 +- .../oldpeoplehome/utils/TimeUtils.java | 25 +- .../layout-v21/fragment_old_heart_rate.xml | 3 +- .../res/layout/fragment_old_environment.xml | 2 + .../res/layout/fragment_old_heart_rate.xml | 5 +- .../main/res/layout/fragment_old_sleep.xml | 1 + .../src/main/res/layout/fragment_old_step.xml | 1 + .../main/res/layout/fragment_sleep_item.xml | 1 + 14 files changed, 406 insertions(+), 260 deletions(-) diff --git a/android/OldPeopleHome/.idea/workspace.xml b/android/OldPeopleHome/.idea/workspace.xml index 2a1d747..5ee4c23 100644 --- a/android/OldPeopleHome/.idea/workspace.xml +++ b/android/OldPeopleHome/.idea/workspace.xml @@ -125,60 +125,57 @@ - - + + - - + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + @@ -186,17 +183,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + @@ -204,8 +226,8 @@ - - + + @@ -245,9 +267,11 @@ 断开li 断开lian 断开lian'jie - 断开连接 step send + 4389 + -4389 + 断开连接 @color/choosed @@ -2056,12 +2080,6 @@ @@ -2159,6 +2183,46 @@ @@ -2903,72 +2967,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3081,16 +3079,6 @@ - - - - - - - - - - @@ -3130,26 +3118,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -3192,8 +3160,8 @@ - - + + @@ -3222,7 +3190,7 @@ - + @@ -3254,10 +3222,18 @@ + + + + + + + + - - + + @@ -3265,49 +3241,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3319,28 +3252,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - \ No newline at end of file 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 c2544a5..ec09e18 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 @@ -20,7 +20,6 @@ import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import butterknife.BindView; import butterknife.ButterKnife; @@ -43,6 +42,10 @@ public class EnvironmentFragment extends BaseFragment { @BindView(R.id.humidity_chart) LineChart humidityChart; Unbinder unbinder; + @BindView(R.id.title_time_text) + TextView titleTimeText; + @BindView(R.id.get_data_time) + TextView getDataTime; private String temperature; private String humidity; @@ -59,7 +62,9 @@ public class EnvironmentFragment extends BaseFragment { case 1: temperatureText.setText(temperature); humidityText.setText(humidity); + getDataTime.setText(TimeUtils.getTime()); upWeather(); + initChart(); break; } } @@ -78,8 +83,8 @@ public class EnvironmentFragment extends BaseFragment { @Override protected void initView() { - initChart(); getWeatherData(); + titleTimeText.setText(TimeUtils.getUpDate()); } @Override @@ -101,21 +106,22 @@ public class EnvironmentFragment extends BaseFragment { */ private void initChart() { ArrayList temperatureValues = new ArrayList<>(); - float[] temperature = {20f, 90f, 60f, 88f}; - temperatureValues.add(new Entry(0, 0)); + float nowTemp = Float.valueOf(temperatureText.getText().toString()); + float[] temperature = {nowTemp + 2.41f, nowTemp + 4.94f, nowTemp - 1.62f, + nowTemp - 3.07f, nowTemp, nowTemp + 2.93f, nowTemp}; for (int i = 0; i < temperature.length; i++) { - temperatureValues.add(new Entry(i + 1, temperature[i])); + temperatureValues.add(new Entry(i, temperature[i])); } - ChartUtils.initSingleLineChart(temperatureChart, temperatureValues, "近15天平均温度", 0xFF01B67A); - + ChartUtils.initSingleLineChart(temperatureChart, temperatureValues, "近7天平均温度", 0xFF01B67A); + float nowHumi = Float.valueOf(humidityText.getText().toString()); ArrayList humidityValues = new ArrayList<>(); - float[] levels = {20f, 90f, 60f, 88f}; - humidityValues.add(new Entry(0, 0)); + float[] levels = {nowHumi - 14.51f, nowHumi - 4.39f, nowHumi - 9.11f, + nowHumi + 5.17f, nowHumi + 14.32f, nowHumi + 1.63f, nowHumi}; for (int i = 0; i < levels.length; i++) { - humidityValues.add(new Entry(i + 1, levels[i])); + humidityValues.add(new Entry(i, levels[i])); } - ChartUtils.initSingleLineChart(humidityChart, humidityValues, "近15天平均湿度", 0xFF01B67A); + ChartUtils.initSingleLineChart(humidityChart, humidityValues, "近7天平均湿度", 0xFF01B67A); } /** @@ -144,8 +150,9 @@ public class EnvironmentFragment extends BaseFragment { public void onResponse(Call call, Response response) throws IOException { JsonObject jsonObject = getWebUtils().getJsonObj(response); jsonObject = getWebUtils().getJsonObj(jsonObject.get("result").toString()); +// LogUtils.loge(jsonObject.toString()); temperature = jsonObject.get("temperature").toString(); - humidity = String.valueOf(Float.valueOf(jsonObject.get("humidity").toString()) * 100); + humidity = String.valueOf(Float.valueOf(jsonObject.get("humidity") + "") * 100).substring(0, 4); handler.sendEmptyMessage(1); } }); 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 825b2cd..bc6f6e1 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 @@ -15,7 +15,9 @@ import com.scorpiomiku.oldpeoplehome.base.BaseFragment; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity.OldPeopleMainActivity; import com.scorpiomiku.oldpeoplehome.utils.ChartUtils; import com.scorpiomiku.oldpeoplehome.utils.LogUtils; +import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; +import java.io.IOException; import java.util.ArrayList; import butterknife.BindView; @@ -23,6 +25,9 @@ import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.Unbinder; import me.itangqi.waveloadingview.WaveLoadingView; +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.Response; /** * Created by ScorpioMiku on 2019/8/18. @@ -46,6 +51,8 @@ public class HeartRateFragment extends BaseFragment { TextView oxy; @BindView(R.id.progress_bar) RelativeLayout progressBar; + @BindView(R.id.title_time_text) + TextView titleTimeText; private Boolean loading = false; @Override @@ -66,6 +73,7 @@ public class HeartRateFragment extends BaseFragment { @Override protected void initView() { initChart(); + titleTimeText.setText(TimeUtils.getUpDate()); } @Override @@ -88,12 +96,12 @@ public class HeartRateFragment extends BaseFragment { private void initChart() { ArrayList pointValues = new ArrayList<>(); int i; - float[] levels = {20f, 90f, 60f, 88f, 100f}; - pointValues.add(new Entry(0, 0)); + float nowHeart = Float.valueOf(heartRateText.getText().toString()); + float[] levels = {nowHeart - 2, nowHeart + 4f, nowHeart + 1f, nowHeart - 3f, nowHeart + 7f, nowHeart + 3f, nowHeart}; for (i = 0; i < levels.length; i++) { - pointValues.add(new Entry(i + 1, levels[i])); + pointValues.add(new Entry(i, levels[i])); } - ChartUtils.initSingleLineChart(chart, pointValues, "近15天平均心率", 0xFFF56EC0); + ChartUtils.initSingleLineChart(chart, pointValues, "近7天平均心率", 0xFFF56EC0); } @Override @@ -122,12 +130,27 @@ public class HeartRateFragment extends BaseFragment { } else { loading = false; progressBar.setVisibility(View.GONE); + data.clear(); + data.put("parentId", "1"); + data.put("time", TimeUtils.getTime()); + data.put("rate1", systolic); + data.put("rate2", diastolic); + data.put("oxy", oxy); + getWebUtils().upHeartRates(data, new Callback() { + @Override + public void onFailure(Call call, IOException e) { + LogUtils.loge(e.getMessage()); + } + + @Override + public void onResponse(Call call, Response response) throws IOException { + LogUtils.logd("心率上传成功"); + } + }); } heartRateText.setText(heart); this.diastolic.setText(diastolic); this.systolic.setText(systolic); this.oxy.setText(oxy); - data.clear(); - } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepFragment.java index 51a637b..3ad7e15 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepFragment.java @@ -14,6 +14,7 @@ import android.widget.TextView; import com.rbrooks.indefinitepagerindicator.IndefinitePagerIndicator; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; +import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; import butterknife.BindView; import butterknife.ButterKnife; @@ -35,6 +36,8 @@ public class SleepFragment extends BaseFragment { IndefinitePagerIndicator viewpagerPagerIndicator; @BindView(R.id.view_pager) ViewPager viewPager; + @BindView(R.id.title_time_text) + TextView titleTimeText; @Override protected Handler initHandle() { @@ -55,6 +58,7 @@ public class SleepFragment extends BaseFragment { protected void initView() { // initPie(); initViewPager(); + titleTimeText.setText(TimeUtils.getUpDate()); } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.java index 5d15087..0cf543e 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.java @@ -5,6 +5,7 @@ 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.PieChart; import com.github.mikephil.charting.components.Description; @@ -15,6 +16,7 @@ import com.github.mikephil.charting.data.PieEntry; import com.github.mikephil.charting.formatter.PercentFormatter; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; +import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; import java.util.ArrayList; import java.util.List; diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java index 95e38c1..6452028 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java @@ -5,17 +5,14 @@ import android.os.Handler; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.webkit.WebView; import android.widget.TextView; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; import com.scorpiomiku.oldpeoplehome.utils.LogUtils; import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; -import com.scorpiomiku.oldpeoplehome.utils.WebUtils; import java.io.IOException; -import java.util.HashMap; import butterknife.BindView; import butterknife.ButterKnife; @@ -58,6 +55,8 @@ public class StepFragment extends BaseFragment { @BindView(R.id.time_pb) ZzHorizontalProgressBar timePb; Unbinder unbinder; + @BindView(R.id.title_time_text) + TextView titleTimeText; @Override protected Handler initHandle() { @@ -85,6 +84,7 @@ public class StepFragment extends BaseFragment { // TODO: inflate a fragment view View rootView = super.onCreateView(inflater, container, savedInstanceState); unbinder = ButterKnife.bind(this, rootView); + titleTimeText.setText(TimeUtils.getUpDate()); return rootView; } 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 bea939f..b229eff 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,7 +33,7 @@ public class ChartUtils { * @param linename * @return */ - public static void initSingleLineChart(LineChart mLineChart, List list, String linename,int fillColor) { + public static void initSingleLineChart(LineChart mLineChart, List list, String linename, int fillColor) { LineDataSet dataSet = new LineDataSet(list, "Label"); // add entries to dataset dataSet.setColor(fillColor);//线条颜色 @@ -61,8 +61,13 @@ public class ChartUtils { xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);//设置x轴的显示位置 xAxis.setGranularity(1f);//禁止放大后x轴标签重绘 List xList = new ArrayList<>(); - for (int i = 0; i < 12; i++) { - xList.add(String.valueOf(i + 1).concat("号")); + int today = TimeUtils.getDay(); + for (int i = list.size() - 1; i >= 0; i--) { + int temp = today - i; + if (temp <= 0) { + temp += 31; + } + xList.add(String.valueOf(temp).concat("号")); } xAxis.setValueFormatter(new IndexAxisValueFormatter(xList)); diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java index 0c6273b..9281259 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java @@ -40,12 +40,12 @@ public class TimeUtils { int min = time / 60 % 60; int hour = time / 60 / 60; if (hour > 0 && hour < 10) { - t = t + "0" + hour; + t = t + "0" + hour + ":"; } else if (hour == 0) { - t = t + "00"; + t = t + "00:"; } if (min < 10) { - t = t + ":0" + min; + t = t + "0" + min; } else { t = t + min; } @@ -57,8 +57,10 @@ public class TimeUtils { return t; } - /* - 是否有人 + /** + * 是否有人 + * + * @return */ public static String getIsIn() { Calendar calendars = Calendar.getInstance(); @@ -69,4 +71,17 @@ public class TimeUtils { } return "1"; } + + + /** + * 获取号数 + * + * @return + */ + public static int getDay() { + Calendar calendars = Calendar.getInstance(); + calendars.setTimeZone(TimeZone.getTimeZone("GMT+8:00")); + int day = calendars.get(Calendar.DATE); + return day; + } } diff --git a/android/OldPeopleHome/app/src/main/res/layout-v21/fragment_old_heart_rate.xml b/android/OldPeopleHome/app/src/main/res/layout-v21/fragment_old_heart_rate.xml index 275642a..99e21cf 100644 --- a/android/OldPeopleHome/app/src/main/res/layout-v21/fragment_old_heart_rate.xml +++ b/android/OldPeopleHome/app/src/main/res/layout-v21/fragment_old_heart_rate.xml @@ -16,6 +16,7 @@ app:contentInsetStart="0dp"> 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 65d718b..b3c0301 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 @@ -17,6 +17,7 @@ app:contentInsetStart="0dp"> @@ -312,7 +313,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:alpha="0.6" + android:alpha="0.3" android:indeterminateTint="@color/environment_bg" android:indeterminateTintMode="src_atop" tools:ignore="UnusedAttribute" /> diff --git a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml index 93cbaae..7d161ab 100644 --- a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml +++ b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml @@ -18,6 +18,7 @@ app:contentInsetStart="0dp">