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

document

Browse Source
This commit is contained in:
ScorpioMiku
2019-09-11 16:05:55 +08:00
parent 96f263d4ec
commit 8a3d565c88
10 changed files with 552 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,50 +64,6 @@
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="OldPeopleHome" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value=":app" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Tasks" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="build" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="OldPeopleHome" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value=":app" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Tasks" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="android" />
<option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
@@ -125,51 +81,44 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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/children/fragment/SleepFragment.java">
<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="2200">
<caret line="140" column="40" lean-forward="false" selection-start-line="140" selection-start-column="40" selection-end-line="140" selection-end-column="40" />
<state relative-caret-position="462">
<caret line="412" column="45" lean-forward="false" selection-start-line="412" selection-start-column="45" selection-end-line="412" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MapFragment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java">
<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="418">
<caret line="179" column="29" lean-forward="false" selection-start-line="179" selection-start-column="29" selection-end-line="179" selection-end-column="29" />
<state relative-caret-position="559">
<caret line="61" column="0" lean-forward="false" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<file leaf-file-name="fragment_old_my.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_my.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1452">
<caret line="66" column="0" lean-forward="false" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
<state relative-caret-position="110">
<caret line="218" column="39" lean-forward="false" selection-start-line="218" selection-start-column="39" selection-end-line="218" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="5" lean-forward="false" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
<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="294">
<caret line="286" column="60" lean-forward="false" selection-start-line="286" selection-start-column="60" selection-end-line="286" selection-end-column="60" />
<state relative-caret-position="196">
<caret line="139" column="16" lean-forward="false" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -177,62 +126,78 @@
</provider>
</entry>
</file>
<file leaf-file-name="EnvironmentFragment.java" pinned="false" current-in-tab="true">
<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/children/fragment/EnvironmentFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="183" column="66" lean-forward="false" selection-start-line="183" selection-start-column="66" selection-end-line="183" selection-end-column="66" />
<state relative-caret-position="74">
<caret line="137" column="30" lean-forward="false" selection-start-line="137" selection-start-column="30" selection-end-line="137" selection-end-column="30" />
<folding>
<element signature="e#5125#5126#0" expanded="true" />
<element signature="e#5149#5150#0" expanded="true" />
<element signature="e#6597#6598#0" expanded="true" />
<element signature="e#6621#6622#0" expanded="true" />
</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/children/fragment/HeartRateFragment.java">
<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="545">
<caret line="126" column="19" lean-forward="false" selection-start-line="126" selection-start-column="19" selection-end-line="126" selection-end-column="19" />
<folding />
<state relative-caret-position="383">
<caret line="86" column="32" lean-forward="false" selection-start-line="86" selection-start-column="32" selection-end-line="86" selection-end-column="32" />
<folding>
<element signature="e#2757#2758#0" expanded="true" />
<element signature="e#2817#2818#0" expanded="true" />
<element signature="e#6933#6934#0" expanded="true" />
<element signature="e#6957#6958#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fragment_old_environment.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_environment.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="129" column="0" lean-forward="false" selection-start-line="129" selection-start-column="0" selection-end-line="129" selection-end-column="0" />
<folding>
<element signature="e#2332#4967#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fragment_child_environment.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_environment.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="90" column="61" lean-forward="false" selection-start-line="90" selection-start-column="45" selection-end-line="90" selection-end-column="61" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
</file>
<file leaf-file-name="ChildMainActivity.java" pinned="false" current-in-tab="false">
<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="418">
<caret line="339" column="5" lean-forward="false" selection-start-line="339" selection-start-column="5" selection-end-line="339" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="264">
<caret line="113" column="23" lean-forward="false" selection-start-line="113" selection-start-column="23" selection-end-line="113" selection-end-column="23" />
<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="colors.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="39" column="0" lean-forward="false" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
<folding>
<element signature="e#1158#1159#0" expanded="true" />
</folding>
<state relative-caret-position="196">
<caret line="10" column="40" lean-forward="false" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="40" />
<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="611">
<caret line="205" column="39" lean-forward="false" selection-start-line="205" selection-start-column="39" selection-end-line="205" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
@@ -252,11 +217,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>断开连接</find>
<find>-4389</find>
<find>gong'l</find>
<find>gong'li</find>
<find>g</find>
<find>公里</find>
<find>callRemoteDisconnect</find>
<find>disc</find>
@@ -282,6 +242,11 @@
<find>voiddialog</find>
<find>void dialog</find>
<find>log</find>
<find>login</find>
<find>case 1</find>
<find>callRemoteConnect</find>
<find>Y-</find>
<find>断开连接</find>
</findStrings>
<replaceStrings>
<replace>@color/choosed</replace>
@@ -2090,15 +2055,11 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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/res/layout/fragment_old_environment.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/ChartUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_old_people_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_clear_black_24dp.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_step.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_register.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/User.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Child.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
@@ -2116,7 +2077,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/HeartRate.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/bean/RoomState.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_environment.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java" />
<option value="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" />
@@ -2130,16 +2090,21 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_sleep_item.xml" />
<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/SleepFragment.java" />
<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/bean/SleepData.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/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/modules/oldpeople/activity/OldPeopleMainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Location.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.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/children/fragment/MapFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_my.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java" />
<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/HeartRateFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_environment.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_environment.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java" />
</list>
</option>
@@ -2167,6 +2132,7 @@
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
<pane id="AndroidView">
<subPane>
<PATH>
@@ -2242,6 +2208,70 @@
<option name="myItemId" value="modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="oldpeople" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fragmemt" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</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="java" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidSourceTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="oldpeoplehome" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="oldpeople" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="activity" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</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="java" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidSourceTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="oldpeoplehome" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="loginregister" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -2369,7 +2399,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2494,7 +2523,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="1567914054600" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1568188991152" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -2541,7 +2570,7 @@
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
</Profilers>
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567914054600" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1568188991152" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
@@ -2575,6 +2604,27 @@
</ExternalSystemSettings>
<method />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
<configuration default="true" type="JarApplication" factoryName="JAR Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<envs />
@@ -2702,7 +2752,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="1567914054601" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1568188991152" />
</method>
</configuration>
<list size="2">
@@ -2783,8 +2833,7 @@
<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" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20842217" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20788912" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" 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="Favorites" 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="6" side_tool="true" content_ui="tabs" />
@@ -2794,6 +2843,7 @@
<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="Find" 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="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -2806,28 +2856,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/StaticUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="107" lean-forward="false" selection-start-line="16" selection-start-column="107" selection-end-line="16" selection-end-column="107" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/adapter/DrawerPeopleListHolder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="32" column="46" lean-forward="false" selection-start-line="32" selection-start-column="46" selection-end-line="32" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/adapter/DrawerPeopleListAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-235">
<caret line="15" column="38" lean-forward="false" selection-start-line="15" selection-start-column="38" selection-end-line="15" selection-end-column="38" />
</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="519">
@@ -2836,44 +2864,44 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/child_main_spinner_item.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287">
<caret line="15" column="32" lean-forward="false" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/item_drawer_oldpeople.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/item_drawer_oldpeople.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="34" column="21" lean-forward="false" selection-start-line="34" selection-start-column="21" selection-end-line="34" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_sleep.xml">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_child_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_child_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="59" column="57" lean-forward="false" selection-start-line="59" selection-start-column="57" selection-end-line="59" selection-end-column="57" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Sport.java">
<provider selected="true" editor-type-id="text-editor">
@@ -2883,24 +2911,24 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_step.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="55" column="36" lean-forward="false" selection-start-line="55" selection-start-column="36" selection-end-line="55" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_step.xml">
<provider editor-type-id="android-designer2">
<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="287">
<caret line="144" column="35" lean-forward="false" selection-start-line="144" selection-start-column="35" selection-end-line="144" selection-end-column="35" />
</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/fragment/StepFragment.java">
<provider selected="true" editor-type-id="text-editor">
@@ -2916,24 +2944,24 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_heart_rate.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="304" column="23" lean-forward="false" selection-start-line="304" selection-start-column="23" selection-end-line="304" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_heart_rate.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_heart_rate.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="61" column="39" lean-forward="false" selection-start-line="61" selection-start-column="39" selection-end-line="61" selection-end-column="39" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/HeartRate.java">
<provider selected="true" editor-type-id="text-editor">
@@ -2964,34 +2992,24 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/default_bar.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<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/layout/activity_login.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-638">
<caret line="13" column="39" lean-forward="false" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="7" lean-forward="false" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
@@ -3018,13 +3036,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
</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="264">
@@ -3057,16 +3068,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="22">
<caret line="71" column="53" lean-forward="false" selection-start-line="71" selection-start-column="53" selection-end-line="71" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SleepData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
@@ -3086,19 +3087,18 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2156">
<caret line="105" column="22" lean-forward="false" selection-start-line="105" selection-start-column="22" selection-end-line="105" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_sleep_item.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3168">
<caret line="144" column="16" lean-forward="false" selection-start-line="144" selection-start-column="16" selection-end-line="144" selection-end-column="16" />
</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/SleepViewPagerItem.java">
<provider selected="true" editor-type-id="text-editor">
@@ -3107,70 +3107,10 @@
</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="1628">
<caret line="108" column="36" lean-forward="false" selection-start-line="108" selection-start-column="36" selection-end-line="108" selection-end-column="36" />
<folding>
<element signature="e#3502#3503#0" expanded="true" />
<element signature="e#3563#3564#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Location.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="21" lean-forward="false" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<folding>
<element signature="e#597#598#0" expanded="true" />
<element signature="e#626#627#0" expanded="true" />
<element signature="e#670#671#0" expanded="true" />
<element signature="e#706#707#0" expanded="true" />
<element signature="e#742#743#0" expanded="true" />
<element signature="e#774#775#0" expanded="true" />
<element signature="e#824#825#0" expanded="true" />
<element signature="e#866#867#0" expanded="true" />
<element signature="e#901#902#0" expanded="true" />
<element signature="e#932#933#0" expanded="true" />
<element signature="e#980#981#0" expanded="true" />
<element signature="e#1020#1021#0" expanded="true" />
<element signature="e#1051#1052#0" expanded="true" />
<element signature="e#1078#1079#0" expanded="true" />
<element signature="e#1118#1119#0" expanded="true" />
<element signature="e#1150#1151#0" 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="2860">
<caret line="158" column="56" lean-forward="false" selection-start-line="158" selection-start-column="56" selection-end-line="158" selection-end-column="56" />
<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="1738">
<caret line="139" column="53" lean-forward="false" selection-start-line="139" selection-start-column="53" selection-end-line="139" selection-end-column="53" />
<folding />
</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="1826">
<caret line="122" column="0" lean-forward="false" selection-start-line="122" selection-start-column="0" selection-end-line="122" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -3187,7 +3127,7 @@
<state relative-caret-position="396">
<caret line="39" column="0" lean-forward="false" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
<folding>
<element signature="e#1158#1159#0" expanded="true" />
<element signature="e#1158#1159#0" expanded="false" />
</folding>
</state>
</provider>
@@ -3208,20 +3148,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_environment.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="90" column="61" lean-forward="false" selection-start-line="90" selection-start-column="45" selection-end-line="90" selection-end-column="61" />
<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/children/activity/ChildMainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<state relative-caret-position="6204">
<caret line="339" column="5" lean-forward="false" selection-start-line="339" selection-start-column="5" selection-end-line="339" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
@@ -3231,37 +3160,159 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/HeartRateFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="545">
<state relative-caret-position="2046">
<caret line="126" column="19" lean-forward="false" selection-start-line="126" selection-start-column="19" selection-end-line="126" selection-end-column="19" />
<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="294">
<caret line="286" column="60" lean-forward="false" selection-start-line="286" selection-start-column="60" selection-end-line="286" selection-end-column="60" />
<folding>
<element signature="imports" expanded="true" />
<element signature="imports" expanded="false" />
<element signature="e#2012#2013#0" expanded="false" />
<element signature="e#2069#2070#0" expanded="false" />
<element signature="e#3629#3630#0" expanded="false" />
<element signature="e#3690#3691#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="338">
<caret line="183" column="47" lean-forward="false" selection-start-line="183" selection-start-column="47" selection-end-line="183" selection-end-column="47" />
<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="418">
<caret line="179" column="29" lean-forward="false" selection-start-line="179" selection-start-column="29" selection-end-line="179" selection-end-column="29" />
<caret line="174" column="5" lean-forward="false" selection-start-line="174" selection-start-column="5" selection-end-line="174" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="151" column="38" lean-forward="false" selection-start-line="151" selection-start-column="38" selection-end-line="151" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
<folding />
</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="338">
<caret line="135" column="21" lean-forward="false" selection-start-line="135" selection-start-column="21" selection-end-line="135" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_my.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="218" column="39" lean-forward="false" selection-start-line="218" selection-start-column="39" selection-end-line="218" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="10" column="40" lean-forward="false" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="40" />
<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="559">
<caret line="61" column="0" lean-forward="false" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
<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="611">
<caret line="205" column="39" lean-forward="false" selection-start-line="205" selection-start-column="39" selection-end-line="205" selection-end-column="39" />
<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="462">
<caret line="412" column="45" lean-forward="false" selection-start-line="412" selection-start-column="45" selection-end-line="412" selection-end-column="45" />
<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="383">
<caret line="86" column="32" lean-forward="false" selection-start-line="86" selection-start-column="32" selection-end-line="86" selection-end-column="32" />
<folding>
<element signature="e#2757#2758#0" expanded="true" />
<element signature="e#2817#2818#0" expanded="true" />
<element signature="e#6933#6934#0" expanded="true" />
<element signature="e#6957#6958#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_old_environment.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="129" column="0" lean-forward="false" selection-start-line="129" selection-start-column="0" selection-end-line="129" selection-end-column="0" />
<folding>
<element signature="e#2332#4967#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_environment.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="113" column="23" lean-forward="false" selection-start-line="113" selection-start-column="23" selection-end-line="113" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="183" column="66" lean-forward="false" selection-start-line="183" selection-start-column="66" selection-end-line="183" selection-end-column="66" />
<state relative-caret-position="74">
<caret line="137" column="30" lean-forward="false" selection-start-line="137" selection-start-column="30" selection-end-line="137" selection-end-column="30" />
<folding>
<element signature="e#5125#5126#0" expanded="true" />
<element signature="e#5149#5150#0" expanded="true" />
<element signature="e#6597#6598#0" expanded="true" />
<element signature="e#6621#6622#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="196">
<caret line="139" column="16" lean-forward="false" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>

15
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java
View File

@@ -9,6 +9,7 @@ import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
@@ -16,7 +17,6 @@ import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.data.Entry;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
import com.scorpiomiku.oldpeoplehome.bean.OldPeople;
@@ -51,6 +51,8 @@ public class EnvironmentFragment extends BaseFragment {
Unbinder unbinder;
@BindView(R.id.now_time_text)
TextView nowTimeText;
@BindView(R.id.change_button)
Button changeButton;
private RoomState roomState;
private OldPeople oldPeople;
@@ -133,7 +135,7 @@ public class EnvironmentFragment extends BaseFragment {
public void refreshUi(OldPeople oldPeople) {
super.refreshUi(oldPeople);
this.oldPeople = oldPeople;
getWebUtils().getRoomData(oldPeople.getParentId(), new Callback() {
getWebUtils().getRoomData(oldPeople.getParentRoomId(), new Callback() {
@Override
public void onFailure(Call call, IOException e) {
LogUtils.loge(e.getMessage());
@@ -154,10 +156,6 @@ public class EnvironmentFragment extends BaseFragment {
});
}
@OnClick(R.id.temperature_text)
public void onViewClicked() {
dialog();
}
/**
* 弹出dialog进行老人绑定
@@ -194,4 +192,9 @@ public class EnvironmentFragment extends BaseFragment {
});
builder.show();
}
@OnClick(R.id.change_button)
public void onViewClicked() {
dialog();
}
}

44
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
View File

@@ -1,13 +1,16 @@
package com.scorpiomiku.oldpeoplehome.modules.loginregister;
import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v7.app.AlertDialog;
import android.widget.Button;
import android.widget.EditText;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.Toast;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseActivity;
@@ -107,6 +110,7 @@ public class RegisterActivity extends BaseActivity {
@OnClick(R.id.register_button)
public void onViewClicked() {
dialog();
getText();
data.clear();
data.put("childSex", sexText);
@@ -115,17 +119,18 @@ public class RegisterActivity extends BaseActivity {
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);
}
});
// 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);
//
// }
// });
}
/**
@@ -139,4 +144,21 @@ public class RegisterActivity extends BaseActivity {
passwordText = password.getText().toString();
}
private void dialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(this).setIcon(R.mipmap.ic_launcher).setTitle("错误提醒")
.setMessage("注册失败，该账户已存在").setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
//ToDo: 你想做的事情
}
}).setNegativeButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
//ToDo: 你想做的事情
dialogInterface.dismiss();
}
});
builder.create().show();
}
}

32
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
View File

@@ -89,6 +89,7 @@ public class OldPeopleMainActivity extends BaseActivity {
private Location location;
private Boolean mIsBound = false;
private BleDeviceItem targetItem;
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener;
private FragmentManager fragmentManager;
@@ -138,6 +139,7 @@ public class OldPeopleMainActivity extends BaseActivity {
@Override
public void onResponse(Call call, Response response) throws IOException {
LogUtils.logd("上传位置成功");
changeLoc();
}
});
break;
@@ -177,7 +179,7 @@ public class OldPeopleMainActivity extends BaseActivity {
};
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
initFragmentManager();
initBlueSDK();
// initBlueSDK();
setUser((OldPeople) getIntent().getSerializableExtra("user"));
for (int i = 0; i < fragments.length; i++) {
fragments[i].refreshUi((OldPeople) getIntent().getSerializableExtra("user"));
@@ -280,6 +282,7 @@ public class OldPeopleMainActivity extends BaseActivity {
LogUtils.logList(nearbyItemList);
if (item.getBleDeviceName().equals("Y1-4389")) {
callRemoteDisconnect();
targetItem = item;
mac = item.getBleDeviceAddress();
callRemoteConnect(item.getBleDeviceName(), item.getBleDeviceAddress());
}
@@ -664,7 +667,6 @@ public class OldPeopleMainActivity extends BaseActivity {
LogUtils.logd("callRemoteConnect: ble device mac address is not correctly!");
return;
}
if (mService != null) {
try {
mService.connectBt(name, mac);
@@ -724,7 +726,10 @@ public class OldPeopleMainActivity extends BaseActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.floating_button:
getNewHandData();
// LogUtils.loge(targetItem.toString());
initBlueSDK();
// getNewHandData();
break;
case R.id.close_button:
callRemoteDisconnect();
@@ -741,6 +746,8 @@ public class OldPeopleMainActivity extends BaseActivity {
}
}
private boolean upLoc = true;
private void startLocation() {
mLocationClient = new LocationClient(getApplicationContext());
mLocationClient.registerLocationListener(new BDAbstractLocationListener() {
@@ -759,7 +766,10 @@ public class OldPeopleMainActivity extends BaseActivity {
location.setLongitude(longitude + "");
location.setParent(getOldPeopleUser().getParentId());
location.setTime(TimeUtils.getTime());
handler.sendEmptyMessage(3);
if (upLoc) {
handler.sendEmptyMessage(3);
upLoc = false;
}
}
});
LocationClientOption option = new LocationClientOption();
@@ -775,5 +785,19 @@ public class OldPeopleMainActivity extends BaseActivity {
mLocationClient.start();
}
private void changeLoc() {
new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
upLoc = true;
}
}).start();
}
}

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

@@ -1,12 +1,16 @@
package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt;
import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import com.github.mikephil.charting.charts.LineChart;
@@ -14,6 +18,7 @@ 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.bean.OldPeople;
import com.scorpiomiku.oldpeoplehome.utils.ChartUtils;
import com.scorpiomiku.oldpeoplehome.utils.LogUtils;
import com.scorpiomiku.oldpeoplehome.utils.TimeUtils;
@@ -23,6 +28,7 @@ import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Callback;
@@ -46,10 +52,13 @@ public class EnvironmentFragment extends BaseFragment {
TextView titleTimeText;
@BindView(R.id.get_data_time)
TextView getDataTime;
@BindView(R.id.change_button)
Button changeButton;
private String temperature;
private String humidity;
private Boolean first = true;
private OldPeople oldPeople;
@SuppressLint("HandlerLeak")
@Override
@@ -66,6 +75,8 @@ public class EnvironmentFragment extends BaseFragment {
upWeather();
initChart();
break;
case 2:
break;
}
}
};
@@ -83,7 +94,6 @@ public class EnvironmentFragment extends BaseFragment {
@Override
protected void initView() {
getWeatherData();
titleTimeText.setText(TimeUtils.getUpDate());
}
@@ -101,6 +111,12 @@ public class EnvironmentFragment extends BaseFragment {
unbinder.unbind();
}
@Override
public void onResume() {
super.onResume();
getWeatherData();
}
/**
* 初始化Chart
*/
@@ -183,8 +199,54 @@ public class EnvironmentFragment extends BaseFragment {
@Override
public void onResponse(Call call, Response response) throws IOException {
LogUtils.logd("上传天气数据成功");
getWeatherData();
}
});
}
@Override
public void refreshUi(OldPeople oldPeople) {
super.refreshUi(oldPeople);
this.oldPeople = oldPeople;
}
@OnClick(R.id.change_button)
public void onViewClicked() {
dialog();
}
/**
* 弹出dialog进行老人绑定
*/
private void dialog() {
final EditText editText = new EditText(getContext());
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle("设置房间温度").setIcon(R.drawable.ic_bind).setView(editText)
.setNegativeButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
}
});
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
String temp = editText.getText().toString();
data.clear();
data.put("temp", temp);
getWebUtils().changeTem(oldPeople.getParentRoomId(), 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.loge("temp");
}
});
}
});
builder.show();
}
}

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

@@ -114,12 +114,16 @@ public class HeartRateFragment extends BaseFragment {
@Override
public void onResponse(Call call, Response response) throws IOException {
JsonArray jsonElements = getWebUtils().getJsonArray(response);
LogUtils.loge(jsonElements.toString());
Gson gson = new Gson();
HeartRate[] heartRates = gson.fromJson(jsonElements, HeartRate[].class);
firstHeart = Float.valueOf(heartRates[heartRates.length - 1].getRate());
handler.sendEmptyMessage(2);
try {
JsonArray jsonElements = getWebUtils().getJsonArray(response);
LogUtils.loge(jsonElements.toString());
Gson gson = new Gson();
HeartRate[] heartRates = gson.fromJson(jsonElements, HeartRate[].class);
firstHeart = Float.valueOf(heartRates[heartRates.length - 1].getRate());
handler.sendEmptyMessage(2);
}catch (Exception e){
LogUtils.loge(e.getMessage());
}
}
});
}
@@ -199,8 +203,8 @@ public class HeartRateFragment extends BaseFragment {
handler.sendEmptyMessage(1);
}
heartRateText.setText(heart);
this.diastolic.setText(diastolic);
this.systolic.setText(systolic);
this.diastolic.setText(systolic);
this.systolic.setText(diastolic);
this.oxy.setText(oxy);
}
}

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

@@ -1,15 +1,31 @@
package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
import com.scorpiomiku.oldpeoplehome.modules.loginregister.LoginActivity;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
/**
* Created by ScorpioMiku on 2019/8/18.
*/
public class MyInformationFragment extends BaseFragment {
@BindView(R.id.change)
RelativeLayout change;
Unbinder unbinder;
@Override
protected Handler initHandle() {
return null;
@@ -29,4 +45,25 @@ public class MyInformationFragment extends BaseFragment {
protected void initView() {
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// TODO: inflate a fragment view
View rootView = super.onCreateView(inflater, container, savedInstanceState);
unbinder = ButterKnife.bind(this, rootView);
return rootView;
}
@Override
public void onDestroyView() {
super.onDestroyView();
unbinder.unbind();
}
@OnClick(R.id.change)
public void onViewClicked() {
getActivity().finish();
Intent intent = new Intent(getContext(), LoginActivity.class);
startActivity(intent);
}
}

20
android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
View File

@@ -27,10 +27,10 @@
android:textSize="14sp" />
<TextView
android:id="@+id/now_time_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:id="@+id/now_time_text"
android:text="2019-8-20 15:58"
android:textColor="@color/white_text"
android:textSize="18sp" />
@@ -107,9 +107,21 @@
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_width="30dp"
android:layout_height="match_parent" />
<RelativeLayout
android:layout_width="40dp"
android:layout_height="match_parent">
<Button
android:id="@+id/change_button"
android:layout_width="50dp"
android:layout_height="25dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:background="#30d19b"
android:text="修改"
android:textColor="@color/white_text"
android:textSize="11sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="150dp"

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

@@ -124,9 +124,21 @@
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_width="30dp"
android:layout_height="match_parent" />
<RelativeLayout
android:layout_width="40dp"
android:layout_height="match_parent">
<Button
android:id="@+id/change_button"
android:layout_width="50dp"
android:layout_height="25dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:background="#30d19b"
android:text="修改"
android:textColor="@color/white_text"
android:textSize="11sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="150dp"

3
android/OldPeopleHome/app/src/main/res/layout/fragment_old_my.xml
View File

@@ -216,6 +216,7 @@
android:orientation="vertical">
<RelativeLayout
android:id="@+id/change"
android:layout_width="match_parent"
android:layout_height="70dp">
@@ -224,7 +225,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="关联的亲人"
android:text="切换账号"
android:textSize="16sp" />
<LinearLayout