shen/OldPeopleHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temperature

Browse Source
This commit is contained in:
ScorpioMiku
2019-09-04 13:31:25 +08:00
parent 9dd69d81ac
commit 53f545f5aa
6 changed files with 267 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
android/OldPeopleHome/.idea/workspace.xml generated
View File

@@ -125,54 +125,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="60" column="51" lean-forward="false" selection-start-line="60" selection-start-column="51" selection-end-line="60" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="LoginActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448">
<caret line="72" column="22" lean-forward="false" selection-start-line="72" selection-start-column="22" selection-end-line="72" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OldPeopleMainActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="288" column="44" lean-forward="false" selection-start-line="288" selection-start-column="44" selection-end-line="288" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="StepFragment.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="118" column="36" lean-forward="false" selection-start-line="118" selection-start-column="36" selection-end-line="118" selection-end-column="36" />
<folding>
<element signature="e#3441#3442#0" expanded="true" />
<element signature="e#3502#3503#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TimeUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="25" column="50" lean-forward="false" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
<state relative-caret-position="396">
<caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -207,8 +164,8 @@
<file leaf-file-name="BaseFragment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="46" column="5" lean-forward="false" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
<state relative-caret-position="187">
<caret line="44" column="17" lean-forward="false" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
<folding>
<element signature="e#1319#1320#0" expanded="true" />
<element signature="e#1350#1351#0" expanded="true" />
@@ -220,8 +177,8 @@
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
<state relative-caret-position="277">
<caret line="132" column="10" lean-forward="false" selection-start-line="132" selection-start-column="10" selection-end-line="132" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -229,11 +186,26 @@
</provider>
</entry>
</file>
<file leaf-file-name="StaticUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/StaticUtils.java">
<file leaf-file-name="EnvironmentFragment.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<state relative-caret-position="363">
<caret line="133" column="24" lean-forward="true" selection-start-line="133" selection-start-column="24" selection-end-line="133" selection-end-column="24" />
<folding>
<element signature="e#1540#1964#0" expanded="true" />
<element signature="e#1963#1964#0" expanded="true" />
<element signature="e#5279#5280#0" expanded="true" />
<element signature="e#5340#5341#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TimeUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="497">
<caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
<folding />
</state>
</provider>
@@ -2084,7 +2056,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_right_row.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_my.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_my.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_environment.xml" />
@@ -2119,7 +2090,6 @@
<option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_oxy.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_bloodpressure.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout-v21/fragment_old_heart_rate.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_heart_rate.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java" />
<option value="$PROJECT_DIR$/app/proguard-rules.pro" />
@@ -2129,12 +2099,14 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/StaticUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java" />
</list>
</option>
</component>
@@ -2598,7 +2570,7 @@
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567560927045" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567574837830" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -2645,7 +2617,7 @@
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
</Profilers>
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567560927045" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567574837830" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
@@ -2827,7 +2799,7 @@
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567560927046" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567574837831" />
</method>
</configuration>
<list size="2">
@@ -2885,11 +2857,12 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Logcat" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -3128,13 +3101,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_oxy.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
@@ -3174,14 +3140,6 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="118" column="48" lean-forward="false" selection-start-line="118" selection-start-column="48" selection-end-line="118" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_heart_rate.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
@@ -3285,14 +3243,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448">
<caret line="72" column="22" lean-forward="false" selection-start-line="72" selection-start-column="22" selection-end-line="72" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SportData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="976">
@@ -3304,14 +3254,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="288" column="44" lean-forward="false" selection-start-line="288" selection-start-column="44" selection-end-line="288" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
@@ -3323,10 +3265,53 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="497">
<caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="115" column="33" lean-forward="false" selection-start-line="115" selection-start-column="33" selection-end-line="115" selection-end-column="33" />
<folding>
<element signature="e#3441#3442#0" expanded="true" />
<element signature="e#3502#3503#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="288" column="44" lean-forward="false" selection-start-line="288" selection-start-column="44" selection-end-line="288" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="122" column="28" lean-forward="false" selection-start-line="122" selection-start-column="28" selection-end-line="122" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="46" column="5" lean-forward="false" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
<state relative-caret-position="187">
<caret line="44" column="17" lean-forward="false" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
<folding>
<element signature="e#1319#1320#0" expanded="true" />
<element signature="e#1350#1351#0" expanded="true" />
@@ -3336,29 +3321,23 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
<state relative-caret-position="277">
<caret line="132" column="10" lean-forward="false" selection-start-line="132" selection-start-column="10" selection-end-line="132" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="25" column="50" lean-forward="false" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="118" column="36" lean-forward="false" selection-start-line="118" selection-start-column="36" selection-end-line="118" selection-end-column="36" />
<state relative-caret-position="363">
<caret line="133" column="24" lean-forward="true" selection-start-line="133" selection-start-column="24" selection-end-line="133" selection-end-column="24" />
<folding>
<element signature="e#3441#3442#0" expanded="true" />
<element signature="e#3502#3503#0" expanded="true" />
<element signature="e#1540#1964#0" expanded="true" />
<element signature="e#1963#1964#0" expanded="true" />
<element signature="e#5279#5280#0" expanded="true" />
<element signature="e#5340#5341#0" expanded="true" />
</folding>
</state>
</provider>

2
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java
View File

@@ -17,6 +17,7 @@ import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseActivity;
import com.scorpiomiku.oldpeoplehome.modules.children.activity.ChildMainActivity;
import com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity.OldPeopleMainActivity;
import com.scorpiomiku.oldpeoplehome.utils.TimeUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -44,6 +45,7 @@ public class LoginActivity extends BaseActivity {
@Override
public void iniview() {
checkPermission();
}
@Override

89
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
View File

@@ -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;
@@ -9,15 +11,23 @@ import android.widget.TextView;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.data.Entry;
import com.google.gson.JsonObject;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
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 java.util.HashMap;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.Response;
/**
* Created by ScorpioMiku on 2019/8/18.
@@ -34,9 +44,26 @@ public class EnvironmentFragment extends BaseFragment {
LineChart humidityChart;
Unbinder unbinder;
private String temperature;
private String humidity;
private Boolean first = true;
@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:
temperatureText.setText(temperature);
humidityText.setText(humidity);
upWeather();
break;
}
}
};
}
@Override
@@ -52,6 +79,7 @@ public class EnvironmentFragment extends BaseFragment {
@Override
protected void initView() {
initChart();
getWeatherData();
}
@Override
@@ -89,4 +117,63 @@ public class EnvironmentFragment extends BaseFragment {
}
ChartUtils.initSingleLineChart(humidityChart, humidityValues, "近15天平均湿度", 0xFF01B67A);
}
/**
* 获取天气
*/
private void getWeatherData() {
new Thread(new Runnable() {
@Override
public void run() {
if (!first) {
try {
Thread.sleep(600000);
} catch (InterruptedException e) {
e.printStackTrace();
}
} else {
first = false;
}
getWebUtils().getWeather(new Callback() {
@Override
public void onFailure(Call call, IOException e) {
LogUtils.loge(e.getMessage());
}
@Override
public void onResponse(Call call, Response response) throws IOException {
JsonObject jsonObject = getWebUtils().getJsonObj(response);
jsonObject = getWebUtils().getJsonObj(jsonObject.get("result").toString());
temperature = jsonObject.get("temperature").toString();
humidity = String.valueOf(Float.valueOf(jsonObject.get("humidity").toString()) * 100);
handler.sendEmptyMessage(1);
}
});
}
}).start();
}
/**
* 上传天气数据
*/
private void upWeather() {
data.clear();
data.put("roomId", "1");
data.put("time", TimeUtils.getTime());
data.put("temperature", temperature);
data.put("humidity", humidity);
data.put("isin", TimeUtils.getIsIn());
getWebUtils().upRoomState(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("上传天气数据成功");
getWeatherData();
}
});
}
}

3
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
View File

@@ -115,7 +115,6 @@ public class HeartRateFragment extends BaseFragment {
* @param heart
*/
public void changeText(String heart, String systolic, String diastolic, String oxy) {
// LogUtils.loge(this.systolic.getText().toString() + ";" + systolic + ";" + (systolic.equals(this.systolic.getText().toString())));
if (systolic.equals(this.systolic.getText().toString())) {
if (!loading) {
progressBar.setVisibility(View.VISIBLE);
@@ -128,7 +127,7 @@ public class HeartRateFragment extends BaseFragment {
this.diastolic.setText(diastolic);
this.systolic.setText(systolic);
this.oxy.setText(oxy);
data.clear();
}
}

18
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java
View File

@@ -3,7 +3,9 @@ package com.scorpiomiku.oldpeoplehome.utils;
import android.annotation.SuppressLint;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
/**
* Created by ScorpioMiku on 2019/8/18.
@@ -12,7 +14,7 @@ import java.util.Date;
public class TimeUtils {
public static String getTime() {
@SuppressLint("SimpleDateFormat") SimpleDateFormat simpleDateFormat
= new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");// HH:mm:ss
= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// HH:mm:ss
//获取当前时间
Date date = new Date(System.currentTimeMillis());
return simpleDateFormat.format(date) + "";
@@ -52,7 +54,19 @@ public class TimeUtils {
} else {
t = t + ":" + sec;
}
return t;
}
/*
是否有人
*/
public static String getIsIn() {
Calendar calendars = Calendar.getInstance();
calendars.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
int hour = calendars.get(Calendar.HOUR_OF_DAY);
if (hour > 22 || hour < 8) {
return "0";
}
return "1";
}
}

71
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java
View File

@@ -1,5 +1,9 @@
package com.scorpiomiku.oldpeoplehome.utils;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import java.io.IOException;
import java.util.HashMap;
import java.util.Set;
@@ -9,6 +13,7 @@ import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import static com.scorpiomiku.oldpeoplehome.utils.StaticUtils.webHost;
@@ -53,6 +58,19 @@ public class WebUtils {
return requestBody;
}
public JsonObject getJsonObj(Response response) throws IOException {
String result = response.body().string();
JsonParser jsonParser = new JsonParser();
JsonObject jsonObject = (JsonObject) jsonParser.parse(result);
return jsonObject;
}
public JsonObject getJsonObj(String json) throws IOException {
JsonParser jsonParser = new JsonParser();
JsonObject jsonObject = (JsonObject) jsonParser.parse(json);
return jsonObject;
}
/**
* ~上传运动信息
*
@@ -65,4 +83,57 @@ public class WebUtils {
Call call = mClient.newCall(request);
call.enqueue(callback);
}
/**
* 上传心率等信息
*
* @param data
* @param callback
*/
public void upHeartRates(HashMap<String, String> data, Callback callback) {
Request request = new Request.Builder().post(postRequestBody(data))
.url(webHost + "/heartrate/add/").build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
/**
* 获取房间数据
*
* @param roomId
* @param callback
*/
public void getRoomData(String roomId, Callback callback) {
Request request = new Request.Builder()
.url(webHost + "/rstate/get/" + roomId)
.build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
/**
* 获取天气信息
*
* @param callback
*/
public void getWeather(Callback callback) {
Request request = new Request.Builder()
.url("https://api.caiyunapp.com/v2/TAkhjf8d1nlSlspN/112.4450,38.0134/realtime.jsonp")
.build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
/**
* 上传房间环境数据
*
* @param hashMap
* @param callback
*/
public void upRoomState(HashMap<String, String> hashMap, Callback callback) {
Request request = new Request.Builder().post(getRequestBody(hashMap))
.url(webHost + "/rstate/add/").build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
}