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 1/4] 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"> Date: Wed, 4 Sep 2019 20:24:12 +0800 Subject: [PATCH 2/4] Update README.md --- server/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/README.md b/server/README.md index 9abc1c0..4c4ee84 100644 --- a/server/README.md +++ b/server/README.md @@ -77,7 +77,7 @@ | Parent | /parent/add | POST | 添加老人 | parentSex：老人性别，parentPassword：老人密码，parentAccount：账号，parentName：姓名，parentBirth：生日，parentLongId：身份证 | | Parent | /parent/update/1 | POST | 更新id=1的老人信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName | | Parent | /parent/delete/1 | DELETE | 删除id=1的老人 | | -| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回） | +| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回） account:bao,password:123 | | Child | /child/get/1 | GET | 查询id=1的子女 | | | Child | /child/get_longid/111 | GET | 查询身份证=111的child的详细信息 | | | Child | /child/get_name/小蒋 | GET | 查询姓名=小蒋的child的详细信息 | | @@ -85,7 +85,7 @@ | Child | /child/add | POST | | childSex，childPassword，childAccount，childName，childLongId，childPhone | | Child | /child/update/1 | POST | 更新id=1的子女信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName | | Child | /child/delete/1 | DELETE | 删除id=1的子女信息 | | -| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) | +| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) account:bao,password:123 | | ChildAndParent | /child_parent/child/1 | GET | 查看子女id=1对应的老人 | | | ChildAndParent | /child_parent/parent/1 | GET | 查看老人id=1对应的子女 | | | ChildAndParent | /child_parent/add | POST | 添加老人子女对应关系 | 子女id：child，老人id：parent，关系：relation | From 8eba4cf34fde64a6ad9fee05589e8933b8dcb6da Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Wed, 4 Sep 2019 20:46:15 +0800 Subject: [PATCH 3/4] child login --- android/OldPeopleHome/.idea/workspace.xml | 800 ++++++++++-------- .../app/src/main/AndroidManifest.xml | 1 + .../oldpeoplehome/base/BaseActivity.java | 10 + .../oldpeoplehome/base/BaseFragment.java | 10 + .../scorpiomiku/oldpeoplehome/bean/Child.java | 74 ++ .../oldpeoplehome/bean/SleepData.java | 53 ++ .../scorpiomiku/oldpeoplehome/bean/User.java | 8 + .../children/fragment/MapFragment.java | 12 +- .../modules/loginregister/LoginActivity.java | 67 +- .../loginregister/RegisterActivity.java | 109 ++- .../activity/OldPeopleMainActivity.java | 35 +- .../oldpeople/fragmemt/HeartRateFragment.java | 45 +- .../oldpeople/fragmemt/SleepFragment.java | 10 +- .../fragmemt/SleepViewPagerItem.java | 9 + .../oldpeople/fragmemt/StepFragment.java | 43 +- .../oldpeoplehome/utils/WebUtils.java | 26 + .../main/res/drawable/ic_clear_black_24dp.xml | 9 + .../res/layout/activity_old_people_main.xml | 14 + .../src/main/res/layout/activity_register.xml | 215 +++-- .../main/res/layout/fragment_child_step.xml | 2 +- .../src/main/res/layout/fragment_old_step.xml | 14 +- 21 files changed, 1109 insertions(+), 457 deletions(-) create mode 100644 android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Child.java create mode 100644 android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SleepData.java create mode 100644 android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/User.java create mode 100644 android/OldPeopleHome/app/src/main/res/drawable/ic_clear_black_24dp.xml diff --git a/android/OldPeopleHome/.idea/workspace.xml b/android/OldPeopleHome/.idea/workspace.xml index 5ee4c23..7bd0aae 100644 --- a/android/OldPeopleHome/.idea/workspace.xml +++ b/android/OldPeopleHome/.idea/workspace.xml @@ -125,57 +125,145 @@ - - + + - - + + + + + + + + + + + + + + + - - + + + + - - + + - - + + - - + + - - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -183,53 +271,18 @@ - - + + - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -242,15 +295,12 @@ - #707070 - @color/choosed - des - 200 , connected onScanCallback @@ -270,8 +320,17 @@ step send 4389 - -4389 断开连接 + -4389 + gong'l + gong'li + g + 公里 + callRemoteDisconnect + disc + isconnect failed + heart + initc @color/choosed @@ -2080,12 +2139,6 @@ @@ -2197,32 +2256,10 @@ @@ -2634,7 +2671,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3069,16 +3039,6 @@ - - - - - - - - - - @@ -3133,17 +3093,6 @@ - - - - - - - - - - - @@ -3166,17 +3115,6 @@ - - - - - - - - - - - @@ -3185,16 +3123,6 @@ - - - - - - - - - - @@ -3211,47 +3139,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3260,17 +3147,6 @@ - - - - - - - - - - - @@ -3293,17 +3169,6 @@ - - - - - - - - - - - @@ -3337,25 +3202,6 @@ - - - - - - - - - - - - - - - - - - - @@ -3366,64 +3212,336 @@ - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - - - - - + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/OldPeopleHome/app/src/main/AndroidManifest.xml b/android/OldPeopleHome/app/src/main/AndroidManifest.xml index 4bbf570..b64e316 100644 --- a/android/OldPeopleHome/app/src/main/AndroidManifest.xml +++ b/android/OldPeopleHome/app/src/main/AndroidManifest.xml @@ -80,6 +80,7 @@ + \ No newline at end of file diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java index 90e0122..61ff7bc 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java @@ -10,6 +10,7 @@ import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; +import com.scorpiomiku.oldpeoplehome.bean.User; import com.scorpiomiku.oldpeoplehome.modules.loginregister.LoginActivity; import com.scorpiomiku.oldpeoplehome.utils.LogUtils; import com.scorpiomiku.oldpeoplehome.utils.WebUtils; @@ -26,6 +27,15 @@ public abstract class BaseActivity extends AppCompatActivity { protected Handler handler; protected HashMap data = new HashMap<>(); private WebUtils webUtils; + private User user; + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } @Override public void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseFragment.java index 3df969a..4b776fa 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseFragment.java @@ -10,6 +10,7 @@ import android.view.View; import android.view.ViewGroup; +import com.scorpiomiku.oldpeoplehome.bean.User; import com.scorpiomiku.oldpeoplehome.utils.LogUtils; import com.scorpiomiku.oldpeoplehome.utils.WebUtils; @@ -25,6 +26,15 @@ public abstract class BaseFragment extends Fragment { protected Handler handler; protected HashMap data = new HashMap<>(); private WebUtils webUtils; + private User user; + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } @Nullable @Override diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Child.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Child.java new file mode 100644 index 0000000..62bbbf1 --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Child.java @@ -0,0 +1,74 @@ +package com.scorpiomiku.oldpeoplehome.bean; + +/** + * Created by ScorpioMiku on 2019/9/4. + */ + +public class Child implements User { + private String childSex; + private String childPassword; + private String childAccount; + private String childName; + private String childLongId; + private String childPhone; + + public String getChildSex() { + return childSex; + } + + public void setChildSex(String childSex) { + this.childSex = childSex; + } + + public String getChildPassword() { + return childPassword; + } + + public void setChildPassword(String childPassword) { + this.childPassword = childPassword; + } + + public String getChildAccount() { + return childAccount; + } + + public void setChildAccount(String childAccount) { + this.childAccount = childAccount; + } + + public String getChildName() { + return childName; + } + + public void setChildName(String childName) { + this.childName = childName; + } + + public String getChildLongId() { + return childLongId; + } + + public void setChildLongId(String childLongId) { + this.childLongId = childLongId; + } + + public String getChildPhone() { + return childPhone; + } + + public void setChildPhone(String childPhone) { + this.childPhone = childPhone; + } + + @Override + public String toString() { + return "Child{" + + "childSex='" + childSex + '\'' + + ", childPassword='" + childPassword + '\'' + + ", childAccount='" + childAccount + '\'' + + ", childName='" + childName + '\'' + + ", childLongId='" + childLongId + '\'' + + ", childPhone='" + childPhone + '\'' + + '}'; + } +} diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SleepData.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SleepData.java new file mode 100644 index 0000000..1df06ea --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SleepData.java @@ -0,0 +1,53 @@ +package com.scorpiomiku.oldpeoplehome.bean; + +/** + * Created by ScorpioMiku on 2019/9/4. + */ + +public class SleepData { + private String parent; + private String date; + private String deep; + private String light; + private String awake; + + public String getParent() { + return parent; + } + + public void setParent(String parent) { + this.parent = parent; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getLight() { + return light; + } + + public void setLight(String light) { + this.light = light; + } + + public String getAwake() { + return awake; + } + + public void setAwake(String awake) { + this.awake = awake; + } +} diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/User.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/User.java new file mode 100644 index 0000000..a62afaf --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/User.java @@ -0,0 +1,8 @@ +package com.scorpiomiku.oldpeoplehome.bean; + +/** + * Created by ScorpioMiku on 2019/9/4. + */ + +public interface User { +} diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java index 1b98496..1334211 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java @@ -104,13 +104,13 @@ public class MapFragment extends BaseFragment { * 轨迹 */ private void drawLine() { -// LatLng p1 = new LatLng(38.019467, 112.455778); -// LatLng p2 = new LatLng(38.019467, 112.465778);1 -// LatLng p3 = new LatLng(38.019467, 112.455978); + LatLng p1 = new LatLng(38.019467, 112.455778); + LatLng p2 = new LatLng(38.019467, 112.465778); + LatLng p3 = new LatLng(38.019467, 112.455978); List points = new ArrayList(); -// points.add(p1); -// points.add(p2); -// points.add(p3); + points.add(p1); + points.add(p2); + points.add(p3); //设置折线的属性 OverlayOptions mOverlayOptions = new PolylineOptions() .width(10) diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java index 7208225..4918238 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java @@ -1,10 +1,12 @@ package com.scorpiomiku.oldpeoplehome.modules.loginregister; import android.Manifest; +import android.annotation.SuppressLint; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; +import android.os.Message; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.view.View; @@ -13,15 +15,25 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; +import com.google.gson.Gson; +import com.google.gson.JsonObject; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseActivity; +import com.scorpiomiku.oldpeoplehome.bean.Child; import com.scorpiomiku.oldpeoplehome.modules.children.activity.ChildMainActivity; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity.OldPeopleMainActivity; +import com.scorpiomiku.oldpeoplehome.utils.LogUtils; import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; +import com.scorpiomiku.oldpeoplehome.utils.WebUtils; + +import java.io.IOException; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.Response; public class LoginActivity extends BaseActivity { @@ -37,9 +49,25 @@ public class LoginActivity extends BaseActivity { @BindView(R.id.login_find_pwd) TextView loginFindPwd; + @SuppressLint("HandlerLeak") @Override protected Handler initHandle() { - return null; + return new Handler() { + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { + case 1: + Intent intent = new Intent(LoginActivity.this, ChildMainActivity.class); + startActivity(intent); + finish(); + break; + case 2: + LogUtils.shortToast("密码错误"); + break; + } + } + }; } @Override @@ -69,14 +97,45 @@ public class LoginActivity extends BaseActivity { public void onViewClicked(View view) { switch (view.getId()) { case R.id.login_btn_login: - Intent intent = new Intent(LoginActivity.this, OldPeopleMainActivity.class); - startActivity(intent); - finish(); + login(); break; case R.id.linear_layout_btn_register: + Intent intent1 = new Intent(LoginActivity.this, RegisterActivity.class); + startActivity(intent1); break; } } + /** + * 登录 + */ + private void login() { + String account = loginEdtUsername.getText().toString(); + String password = loginEdtPassword.getText().toString(); + data.clear(); + data.put("account", account); + data.put("password", password); + getWebUtils().loginChild(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 { + try { + JsonObject jsonObject = getWebUtils().getJsonObj(response); + Gson gson = new Gson(); + Child child = gson.fromJson(jsonObject, Child.class); + setUser(child); + handler.sendEmptyMessage(1); + } catch (Exception e) { + LogUtils.loge(e.getMessage()); + handler.sendEmptyMessage(2); + } + + } + }); + } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java index f3951a9..5d263be 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java @@ -1,23 +1,86 @@ package com.scorpiomiku.oldpeoplehome.modules.loginregister; +import android.annotation.SuppressLint; +import android.os.Bundle; import android.os.Handler; +import android.os.Message; +import android.widget.Button; +import android.widget.EditText; +import android.widget.RadioButton; +import android.widget.RadioGroup; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseActivity; +import com.scorpiomiku.oldpeoplehome.utils.LogUtils; + +import java.io.IOException; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.Response; /** * Created by ScorpioMiku on 2019/8/18. */ public class RegisterActivity extends BaseActivity { + @BindView(R.id.phone) + EditText phone; + @BindView(R.id.id_card) + EditText idCard; + @BindView(R.id.name) + EditText name; + @BindView(R.id.account) + EditText account; + @BindView(R.id.man_rb) + RadioButton manRb; + @BindView(R.id.woman_rb) + RadioButton womanRb; + @BindView(R.id.password) + EditText password; + @BindView(R.id.register_button) + Button registerButton; + @BindView(R.id.sex_r_g) + RadioGroup sexRG; + private String sexText; + private String phoneText; + private String nameText; + private String accountText; + private String passwordText; + private String idCardText; + + + @SuppressLint("HandlerLeak") @Override protected Handler initHandle() { - return null; + return new Handler() { + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { + case 1: + finish(); + break; + } + } + }; } @Override public void iniview() { - + sexRG.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup radioGroup, int checkedId) { + if (checkedId == manRb.getId()) { + sexText = "男"; + } else if (checkedId == womanRb.getId()) { + sexText = "女"; + } + } + }); } @Override @@ -34,4 +97,46 @@ public class RegisterActivity extends BaseActivity { public void onPointerCaptureChanged(boolean hasCapture) { } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + // TODO: add setContentView(...) invocation + ButterKnife.bind(this); + } + + @OnClick(R.id.register_button) + public void onViewClicked() { + getText(); + data.clear(); + data.put("childSex", sexText); + data.put("childPassword", passwordText); + data.put("childAccount", accountText); + data.put("childName", nameText); + data.put("childLongId", idCardText); + data.put("childPhone", phoneText); + getWebUtils().registerChild(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 { + handler.sendEmptyMessage(1); + } + }); + } + + /** + * 获得数据 + */ + private void getText() { + nameText = name.getText().toString(); + phoneText = phone.getText().toString(); + idCardText = idCard.getText().toString(); + accountText = account.getText().toString(); + passwordText = password.getText().toString(); + } + } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java index 44088d5..4abef78 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java @@ -59,6 +59,8 @@ public class OldPeopleMainActivity extends BaseActivity { BottomNavigationView navigation; @BindView(R.id.floating_button) FloatingActionButton floatingButton; + @BindView(R.id.close_button) + FloatingActionButton closeButton; private String step; private String cal; @@ -71,6 +73,8 @@ public class OldPeopleMainActivity extends BaseActivity { private String bloodPressureDiastole = "0"; private String oxygen; + private Boolean mIsBound = false; + private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener; private FragmentManager fragmentManager; private BaseFragment[] fragments = { @@ -493,6 +497,7 @@ public class OldPeopleMainActivity extends BaseActivity { @Override public void onServiceConnected(ComponentName componentName, IBinder service) { LogUtils.shortToast("Service connected"); + mIsBound = true; mService = IRemoteService.Stub.asInterface(service); try { @@ -638,19 +643,11 @@ public class OldPeopleMainActivity extends BaseActivity { private void getNewHandData() { try { mService.getCurSportData(); - for (int i = 5; i >= 0; i--) { - - } } catch (RemoteException e) { e.printStackTrace(); } } - @OnClick(R.id.floating_button) - public void onViewClicked() { - getNewHandData(); - } - /** * 更新UI调用 */ @@ -681,4 +678,26 @@ public class OldPeopleMainActivity extends BaseActivity { e.printStackTrace(); } } + + + @OnClick({R.id.floating_button, R.id.close_button}) + public void onViewClicked(View view) { + switch (view.getId()) { + case R.id.floating_button: + getNewHandData(); + break; + case R.id.close_button: + callRemoteDisconnect(); + if (mIsBound) { + try { + mService.unregisterCallback(mServiceCallback); + } catch (RemoteException e) { + e.printStackTrace(); + } + unbindService(mServiceConnection); + } + mIsBound = false; + break; + } + } } 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 bc6f6e1..717673b 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 @@ -1,7 +1,9 @@ package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt; +import android.annotation.SuppressLint; import android.os.Bundle; import android.os.Handler; +import android.os.Message; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -54,10 +56,32 @@ public class HeartRateFragment extends BaseFragment { @BindView(R.id.title_time_text) TextView titleTimeText; private Boolean loading = false; + private float heartRate; + @SuppressLint("HandlerLeak") @Override protected Handler initHandle() { - return null; + return new Handler(){ + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what){ + case 1: + getWebUtils().upHeartRates(data, new okhttp3.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("心率上传成功"); + } + }); + break; + } + } + }; } @Override @@ -72,7 +96,7 @@ public class HeartRateFragment extends BaseFragment { @Override protected void initView() { - initChart(); +// initChart(); titleTimeText.setText(TimeUtils.getUpDate()); } @@ -125,32 +149,25 @@ public class HeartRateFragment extends BaseFragment { public void changeText(String heart, String systolic, String diastolic, String oxy) { if (systolic.equals(this.systolic.getText().toString())) { if (!loading) { - progressBar.setVisibility(View.VISIBLE); +// progressBar.setVisibility(View.VISIBLE); } } else { loading = false; progressBar.setVisibility(View.GONE); +// begin.setText("开启"); 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("心率上传成功"); - } - }); + initChart(); + handler.sendEmptyMessage(1); } heartRateText.setText(heart); this.diastolic.setText(diastolic); this.systolic.setText(systolic); this.oxy.setText(oxy); + } } 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 3ad7e15..2ceaf20 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,8 +14,11 @@ import android.widget.TextView; import com.rbrooks.indefinitepagerindicator.IndefinitePagerIndicator; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; +import com.scorpiomiku.oldpeoplehome.bean.SleepData; import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; +import java.util.ArrayList; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -30,7 +33,6 @@ public class SleepFragment extends BaseFragment { WaveLoadingView waveLoadingView; @BindView(R.id.sleep_text) TextView sleepText; - Unbinder unbinder; @BindView(R.id.viewpager_pager_indicator) IndefinitePagerIndicator viewpagerPagerIndicator; @@ -38,6 +40,7 @@ public class SleepFragment extends BaseFragment { ViewPager viewPager; @BindView(R.id.title_time_text) TextView titleTimeText; + private ArrayList data = new ArrayList<>(); @Override protected Handler initHandle() { @@ -56,7 +59,6 @@ public class SleepFragment extends BaseFragment { @Override protected void initView() { -// initPie(); initViewPager(); titleTimeText.setText(TimeUtils.getUpDate()); } @@ -120,12 +122,12 @@ public class SleepFragment extends BaseFragment { viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) { @Override public Fragment getItem(int i) { - return new SleepViewPagerItem(); + return SleepViewPagerItem.instance(data.get(i)); } @Override public int getCount() { - return 10; + return data.size(); } }); viewpagerPagerIndicator.attachToViewPager(viewPager); 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 0cf543e..1ea096a 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 @@ -16,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.bean.SleepData; import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; import java.util.ArrayList; @@ -33,6 +34,14 @@ public class SleepViewPagerItem extends BaseFragment { @BindView(R.id.pie_chart) PieChart sleepPie; Unbinder unbinder; + private SleepData sleepData; + + + public static SleepViewPagerItem instance(SleepData sleepData) { + SleepViewPagerItem sleepViewPagerItem = new SleepViewPagerItem(); + sleepViewPagerItem.sleepData = sleepData; + return sleepViewPagerItem; + } @Override protected Handler initHandle() { 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 6452028..d3d7084 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 @@ -1,7 +1,9 @@ package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt; +import android.annotation.SuppressLint; import android.os.Bundle; import android.os.Handler; +import android.os.Message; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -58,9 +60,30 @@ public class StepFragment extends BaseFragment { @BindView(R.id.title_time_text) TextView titleTimeText; + @SuppressLint("HandlerLeak") @Override protected Handler initHandle() { - return null; + return new Handler() { + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { + case 1: + getWebUtils().UpSport(data, new okhttp3.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("运动数据上传成功"); + } + }); + break; + } + } + }; } @Override @@ -118,16 +141,12 @@ public class StepFragment extends BaseFragment { data.put("distance", distance); data.put("time", sportTime); data.put("energy", cal); - getWebUtils().UpSport(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("运动数据上传成功"); - } - }); + handler.sendEmptyMessage(1); + float temp = Float.valueOf(step) / 10000 * 100; + waveLoadingView.setProgressValue((int) temp); + caloriePb.setProgress((int) (temp - 6)); + distancePb.setProgress((int) (temp - 1)); + timePb.setProgress((int) (temp + 8)); + finishPercent.setText((int) temp + ""); } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java index 942bfd7..b798aa0 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java @@ -136,4 +136,30 @@ public class WebUtils { Call call = mClient.newCall(request); call.enqueue(callback); } + + /** + * 注册child + * + * @param hashMap + * @param callback + */ + public void registerChild(HashMap hashMap, Callback callback) { + Request request = new Request.Builder().post(getRequestBody(hashMap)) + .url(webHost + "/child/add/").build(); + Call call = mClient.newCall(request); + call.enqueue(callback); + } + + /** + * child login + * + * @param hashMap + * @param callback + */ + public void loginChild(HashMap hashMap, Callback callback) { + Request request = new Request.Builder().post(getRequestBody(hashMap)) + .url(webHost + "/child/login/").build(); + Call call = mClient.newCall(request); + call.enqueue(callback); + } } diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_clear_black_24dp.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_clear_black_24dp.xml new file mode 100644 index 0000000..6eeb78f --- /dev/null +++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_clear_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml b/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml index 4d38ba6..e15328e 100644 --- a/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml +++ b/android/OldPeopleHome/app/src/main/res/layout/activity_old_people_main.xml @@ -50,6 +50,20 @@ app:borderWidth="0dp" app:fabSize="normal"/> + + @@ -69,6 +68,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112,59 +264,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -