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

15:16

Browse Source
This commit is contained in:
ScorpioMiku
2019-09-04 15:16:38 +08:00
parent dff6a52863
commit b22d5ad1aa
14 changed files with 406 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,60 +125,57 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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">
<file leaf-file-name="SleepViewPagerItem.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.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" />
<state relative-caret-position="-11">
<caret line="34" column="22" lean-forward="false" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
<folding>
<element signature="e#1387#1388#0" expanded="true" />
<element signature="e#1412#1413#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MyInformationFragment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BaseActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/base/BaseActivity.java">
<file leaf-file-name="StepFragment.java" pinned="false" current-in-tab="false">
<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="387">
<caret line="41" column="5" lean-forward="false" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
<state relative-caret-position="61">
<caret line="114" column="26" lean-forward="false" selection-start-line="114" selection-start-column="26" selection-end-line="114" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HeartRateFragment.java" pinned="false" current-in-tab="false">
<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="297">
<caret line="138" column="33" lean-forward="true" selection-start-line="138" selection-start-column="33" selection-end-line="138" selection-end-column="33" />
<folding>
<element signature="e#1164#1165#0" expanded="true" />
<element signature="e#1195#1196#0" expanded="true" />
<element signature="e#1826#1827#0" expanded="true" />
<element signature="e#1881#1882#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SportData.java" pinned="false" current-in-tab="false">
<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">
<caret line="102" column="34" lean-forward="false" selection-start-line="102" selection-start-column="15" selection-end-line="102" selection-end-column="34" />
<folding>
<element signature="e#2367#2368#0" expanded="true" />
<element signature="e#2406#2407#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="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" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false">
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="true">
<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="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" />
<state relative-caret-position="198">
<caret line="92" column="16" lean-forward="false" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="16" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -186,17 +183,42 @@
</provider>
</entry>
</file>
<file leaf-file-name="EnvironmentFragment.java" pinned="false" current-in-tab="true">
<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="3410">
<caret line="245" column="41" lean-forward="false" selection-start-line="245" selection-start-column="20" selection-end-line="245" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ChartUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="64" column="36" lean-forward="false" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SleepFragment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="515">
<caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="EnvironmentFragment.java" pinned="false" current-in-tab="false">
<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="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 relative-caret-position="399">
<caret line="64" column="63" lean-forward="false" selection-start-line="64" selection-start-column="63" selection-end-line="64" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
@@ -204,8 +226,8 @@
<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" />
<state relative-caret-position="233">
<caret line="42" column="35" lean-forward="false" selection-start-line="42" selection-start-column="35" selection-end-line="42" selection-end-column="35" />
<folding />
</state>
</provider>
@@ -245,9 +267,11 @@
<find>断开li</find>
<find>断开lian</find>
<find>断开lian'jie</find>
<find>断开连接</find>
<find>step</find>
<find>send</find>
<find>4389</find>
<find>-4389</find>
<find>断开连接</find>
</findStrings>
<replaceStrings>
<replace>@color/choosed</replace>
@@ -2056,12 +2080,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_heart_rate.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_sleep.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_step.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/HeartRateFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MyInformationFragment.java" />
@@ -2086,12 +2104,8 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_refresh.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_old_people_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_step.xml" />
<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/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" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_map.xml" />
@@ -2099,14 +2113,24 @@
<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/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/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/base/BaseActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_step.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_heart_rate.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout-v21/fragment_old_heart_rate.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_sleep.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_sleep_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_environment.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.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/utils/ChartUtils.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/activity/OldPeopleMainActivity.java" />
</list>
</option>
</component>
@@ -2159,6 +2183,46 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OldPeopleHome" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layout" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OldPeopleHome" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layout" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fragment_old_heart_rate.xml" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OldPeopleHome" />
@@ -2570,7 +2634,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="1567574837830" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567581249792" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -2617,7 +2681,7 @@
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
</Profilers>
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567574837830" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567581249792" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
@@ -2799,7 +2863,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="1567574837831" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567581249793" />
</method>
</configuration>
<list size="2">
@@ -2874,6 +2938,7 @@
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" 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="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2707889" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2965368" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -2890,7 +2955,6 @@
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2707889" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -2903,72 +2967,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="jar://E:/androidSDK/platforms/android-27/android.jar!/android/widget/SpinnerAdapter.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_map.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_my_unchoose.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="36" lean-forward="false" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_right_row.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_my_choose.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_moon.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/adapter/PeopleSpinnerAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="889">
<caret line="52" column="20" lean-forward="false" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/childmain.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313">
<caret line="25" column="31" lean-forward="false" selection-start-line="25" selection-start-column="31" selection-end-line="25" selection-end-column="31" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/oldpeoplemain.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
@@ -3081,16 +3079,6 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_step.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8338">
<caret line="379" column="44" lean-forward="false" selection-start-line="379" selection-start-column="44" selection-end-line="379" selection-end-column="44" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3300">
@@ -3130,26 +3118,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout-v21/fragment_old_heart_rate.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<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">
<caret line="311" column="38" lean-forward="false" selection-start-line="311" selection-start-column="38" selection-end-line="311" selection-end-column="38" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -3192,8 +3160,8 @@
<state relative-caret-position="506">
<caret line="44" column="49" lean-forward="false" selection-start-line="44" selection-start-column="49" selection-end-line="44" selection-end-column="49" />
<folding>
<element signature="e#1152#1153#0" expanded="true" />
<element signature="e#1209#1210#0" expanded="true" />
<element signature="e#1152#1153#0" expanded="false" />
<element signature="e#1209#1210#0" expanded="false" />
</folding>
</state>
</provider>
@@ -3222,7 +3190,7 @@
<state relative-caret-position="493">
<caret line="112" column="25" lean-forward="false" selection-start-line="112" selection-start-column="25" selection-end-line="112" selection-end-column="25" />
<folding>
<element signature="e#3068#3076#0" expanded="true" />
<element signature="e#3068#3076#0" expanded="false" />
</folding>
</state>
</provider>
@@ -3254,10 +3222,18 @@
</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="528">
<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/BaseActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="41" column="5" lean-forward="false" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
<state relative-caret-position="242">
<caret line="27" column="30" lean-forward="false" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="30" />
<folding>
<element signature="e#1164#1165#0" expanded="true" />
<element signature="e#1195#1196#0" expanded="true" />
@@ -3265,49 +3241,6 @@
</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="187">
@@ -3319,28 +3252,178 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build/generated/source/apt/debug/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment_ViewBinding.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="43" column="0" lean-forward="false" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_step.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="18" column="48" lean-forward="false" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout-v21/fragment_old_heart_rate.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="48" lean-forward="false" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_sleep.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="39" lean-forward="false" selection-start-line="22" selection-start-column="39" selection-end-line="22" selection-end-column="39" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<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="331">
<caret line="19" column="48" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="48" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_sleep.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="48" lean-forward="false" selection-start-line="20" selection-start-column="48" selection-end-line="20" selection-end-column="48" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_sleep_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="25" lean-forward="false" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_environment.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="46" column="46" lean-forward="false" selection-start-line="46" selection-start-column="46" selection-end-line="46" selection-end-column="46" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="515">
<caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-11">
<caret line="34" column="22" lean-forward="false" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
<folding>
<element signature="e#1387#1388#0" expanded="true" />
<element signature="e#1412#1413#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="64" column="36" lean-forward="false" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="36" />
<folding />
</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="233">
<caret line="42" column="35" lean-forward="false" selection-start-line="42" selection-start-column="35" selection-end-line="42" selection-end-column="35" />
<folding />
</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="399">
<caret line="64" column="63" lean-forward="false" selection-start-line="64" selection-start-column="63" selection-end-line="64" selection-end-column="63" />
<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="3410">
<caret line="245" column="41" lean-forward="false" selection-start-line="245" selection-start-column="20" selection-end-line="245" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
<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="61">
<caret line="114" column="26" lean-forward="false" selection-start-line="114" selection-start-column="26" selection-end-line="114" selection-end-column="26" />
<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="297">
<caret line="138" column="33" lean-forward="true" selection-start-line="138" selection-start-column="33" selection-end-line="138" selection-end-column="33" />
<folding>
<element signature="e#1826#1827#0" expanded="true" />
<element signature="e#1881#1882#0" expanded="true" />
</folding>
</state>
</provider>
</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="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" />
<state relative-caret-position="198">
<caret line="92" column="16" lean-forward="false" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="16" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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="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>
</component>
</project>

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

@@ -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<Entry> 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<Entry> 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);
}
});

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

@@ -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<Entry> 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();
}
}

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

@@ -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());
}

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

@@ -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;

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

@@ -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;
}

11
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java
View File

@@ -33,7 +33,7 @@ public class ChartUtils {
* @param linename
* @return
*/
public static void initSingleLineChart(LineChart mLineChart, List<Entry> list, String linename,int fillColor) {
public static void initSingleLineChart(LineChart mLineChart, List<Entry> 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<String> 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));

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

@@ -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;
}
}

3
android/OldPeopleHome/app/src/main/res/layout-v21/fragment_old_heart_rate.xml
View File

@@ -16,6 +16,7 @@
app:contentInsetStart="0dp">
<TextView
android:id="@+id/title_time_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
@@ -73,7 +74,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="00:00"
android:text="0"
android:textColor="#FFF"
android:textSize="30sp" />

2
android/OldPeopleHome/app/src/main/res/layout/fragment_old_environment.xml
View File

@@ -17,6 +17,7 @@
app:contentInsetStart="0dp">
<TextView
android:id="@+id/title_time_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
@@ -43,6 +44,7 @@
android:textSize="14sp" />
<TextView
android:id="@+id/get_data_time"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"

5
android/OldPeopleHome/app/src/main/res/layout/fragment_old_heart_rate.xml
View File

@@ -17,6 +17,7 @@
app:contentInsetStart="0dp">
<TextView
android:id="@+id/title_time_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
@@ -74,7 +75,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="00:00"
android:text="0"
android:textColor="#FFF"
android:textSize="30sp" />
@@ -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" />

1
android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml
View File

@@ -18,6 +18,7 @@
app:contentInsetStart="0dp">
<TextView
android:id="@+id/title_time_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"

1
android/OldPeopleHome/app/src/main/res/layout/fragment_old_step.xml
View File

@@ -16,6 +16,7 @@
app:contentInsetStart="0dp">
<TextView
android:id="@+id/title_time_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"

1
android/OldPeopleHome/app/src/main/res/layout/fragment_sleep_item.xml
View File

@@ -5,6 +5,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/time_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"