This commit is contained in:
ScorpioMiku
2019-09-04 08:24:11 +08:00
parent 1736ec5a43
commit 9311cf9e85
6 changed files with 297 additions and 167 deletions

View File

@@ -124,26 +124,6 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="396">
<caret line="641" column="0" lean-forward="false" selection-start-line="641" selection-start-column="0" selection-end-line="641" 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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="26" column="5" lean-forward="false" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="proguard-rules.pro" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
<provider selected="true" editor-type-id="text-editor">
@@ -154,35 +134,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="fragment_old_heart_rate.xml" pinned="false" current-in-tab="false">
<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" />
<folding>
<element signature="e#308#12812#0" expanded="false" />
</folding>
</state>
</provider>
<provider editor-type-id="android-designer2">
<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="1980">
<caret line="118" column="48" lean-forward="false" selection-start-line="118" selection-start-column="48" selection-end-line="118" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343">
<state relative-caret-position="1276">
<caret line="58" column="0" lean-forward="false" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
<folding />
</state>
@@ -192,14 +147,92 @@
</provider>
</entry>
</file>
<file leaf-file-name="OldPeopleHome.java" pinned="false" current-in-tab="true">
<file leaf-file-name="LoginActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="946">
<caret line="69" column="80" lean-forward="false" selection-start-line="69" selection-start-column="80" selection-end-line="69" selection-end-column="80" />
<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">
<provider selected="true" editor-type-id="text-editor">
<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" />
</folding>
</state>
</provider>
</entry>
</file>
<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="154">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContextWrapper.class" pinned="false" current-in-tab="false">
<entry file="jar://E:/androidSDK/platforms/android-27/android.jar!/android/content/ContextWrapper.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="66" column="19" lean-forward="false" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
<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="330">
<caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fragment_child_map.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_map.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<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">
<provider selected="true" editor-type-id="text-editor">
<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" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OldPeopleHome.java" pinned="false" current-in-tab="false">
<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="405">
<state relative-caret-position="616">
<caret line="34" column="13" lean-forward="false" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#717#1435#0" expanded="true" />
<element signature="e#717#1433#0" expanded="true" />
</folding>
</state>
</provider>
@@ -2039,7 +2072,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_environment.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_right_row.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_my.xml" />
@@ -2055,8 +2087,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/StepFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/adapter/PeopleSpinnerAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_map.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_map.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/menu/childmain.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
@@ -2072,7 +2102,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/LogUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/SportData.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.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" />
@@ -2089,7 +2118,11 @@
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/proguard-rules.pro" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/LoginActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_child_map.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.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/utils/WebUtils.java" />
</list>
</option>
</component>
@@ -2114,7 +2147,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="Scope" />
<pane id="AndroidView">
@@ -2139,20 +2171,6 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</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="jniLibs" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidSourceTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OldPeopleHome" />
@@ -2185,8 +2203,31 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidPsiDirectoryNode" />
</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="utils" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -2263,7 +2304,7 @@
<property name="device.picker.selection" value="B2T7N16C11002906" />
<property name="last_directory_selection" value="$PROJECT_DIR$/app/src/main/res/drawable" />
<property name="VectorAssetImportPath" value="E:\BigProject\android\图标" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../handcircle/JYOU PRO SDK/android-sdk-jy/android-smartband-sdk-sxrblejy2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../WIFITrick" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
@@ -2379,8 +2420,7 @@
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method>
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567512937284" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567556627465" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -2427,8 +2467,7 @@
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
</Profilers>
<method>
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567512937284" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567556627465" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
@@ -2610,8 +2649,7 @@
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method>
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567512937285" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567556627466" />
</method>
</configuration>
<list size="2">
@@ -2668,10 +2706,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Android Profiler" 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="TODO" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -2682,7 +2720,7 @@
<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" />
<window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Logcat" 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="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="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="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" />
@@ -2715,27 +2753,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MyInformationFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="19" column="41" lean-forward="false" selection-start-line="19" selection-start-column="41" selection-end-line="19" selection-end-column="41" />
</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="330">
<caret line="43" column="50" lean-forward="false" selection-start-line="43" selection-start-column="50" selection-end-line="43" selection-end-column="50" />
</state>
</provider>
</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="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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml" />
<entry file="jar://E:/androidSDK/platforms/android-27/android.jar!/android/widget/SpinnerAdapter.class">
<provider selected="true" editor-type-id="text-editor">
@@ -2744,23 +2761,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_map.xml">
<provider 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 selected="true" editor-type-id="android-designer2">
<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="352">
<caret line="19" column="42" lean-forward="false" selection-start-line="19" selection-start-column="42" selection-end-line="19" selection-end-column="42" />
</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">
@@ -2883,7 +2883,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1078">
<caret line="71" column="30" lean-forward="false" selection-start-line="71" selection-start-column="30" selection-end-line="71" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
@@ -2899,12 +2898,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="25" column="26" lean-forward="false" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
<folding>
<element signature="e#346#347#0" expanded="false" />
<element signature="e#381#382#0" expanded="false" />
<element signature="e#572#573#0" expanded="false" />
<element signature="e#607#608#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2915,17 +2908,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="1144">
<caret line="78" column="0" lean-forward="false" selection-start-line="78" selection-start-column="0" selection-end-line="78" selection-end-column="0" />
<folding>
<element signature="e#1346#1347#0" expanded="false" />
<element signature="e#1379#1380#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_refresh.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
@@ -2974,10 +2956,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1628">
<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="false" />
<element signature="e#2406#2407#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2985,9 +2963,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="34" column="9" lean-forward="false" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2995,16 +2970,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1144">
<caret line="65" column="21" lean-forward="false" selection-start-line="65" selection-start-column="21" selection-end-line="65" selection-end-column="21" />
<folding>
<element signature="imports" expanded="false" />
</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="902">
<caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
</state>
</provider>
</entry>
@@ -3033,7 +2998,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="39" lean-forward="false" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
@@ -3058,7 +3022,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="118" column="48" lean-forward="false" selection-start-line="118" selection-start-column="48" selection-end-line="118" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
@@ -3066,9 +3029,6 @@
<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" />
<folding>
<element signature="e#308#12812#0" expanded="false" />
</folding>
</state>
</provider>
<provider editor-type-id="android-designer2">
@@ -3079,7 +3039,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
@@ -3087,7 +3046,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="641" column="0" lean-forward="false" selection-start-line="641" selection-start-column="0" selection-end-line="641" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -3109,7 +3067,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343">
<state relative-caret-position="1276">
<caret line="58" column="0" lean-forward="false" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
<folding />
</state>
@@ -3118,16 +3076,80 @@
<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="330">
<caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_child_map.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<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/fragment/HeartRateFragment.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
</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="946">
<caret line="69" column="80" lean-forward="false" selection-start-line="69" selection-start-column="80" selection-end-line="69" selection-end-column="80" />
<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="405">
<state relative-caret-position="616">
<caret line="34" column="13" lean-forward="false" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#717#1435#0" expanded="true" />
<element signature="e#717#1433#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://E:/androidSDK/platforms/android-27/android.jar!/android/content/ContextWrapper.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="66" column="19" lean-forward="false" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
<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="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" />
</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="154">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

View File

@@ -31,7 +31,7 @@ public class OldPeopleHome extends Application {
String coorType = bdLocation.getCoorType();
//获取定位类型、定位错误返回码具体信息可参照类参考中BDLocation类中的说明
int errorCode = bdLocation.getLocType();
// LogUtils.logd(latitude + ";" + longitude + ";" + radius + ";" + coorType + ";" + errorCode);
LogUtils.logd(latitude + ";" + longitude + ";" + radius + ";" + coorType + ";" + errorCode);
}
});
LocationClientOption option = new LocationClientOption();

View File

@@ -1,15 +1,41 @@
package com.scorpiomiku.oldpeoplehome.modules.children.fragment;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.baidu.mapapi.CoordType;
import com.baidu.mapapi.SDKInitializer;
import com.baidu.mapapi.map.MapStatus;
import com.baidu.mapapi.map.MapStatusUpdate;
import com.baidu.mapapi.map.MapStatusUpdateFactory;
import com.baidu.mapapi.map.MapView;
import com.baidu.mapapi.map.Overlay;
import com.baidu.mapapi.map.OverlayOptions;
import com.baidu.mapapi.map.PolylineOptions;
import com.baidu.mapapi.model.LatLng;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* Created by ScorpioMiku on 2019/8/21.
*/
public class MapFragment extends BaseFragment {
@BindView(R.id.map)
MapView map;
Unbinder unbinder;
LatLng GEO_ZHONGBEI = new LatLng(38.019467, 112.455778);
@Override
protected Handler initHandle() {
return null;
@@ -27,6 +53,71 @@ public class MapFragment extends BaseFragment {
@Override
protected void initView() {
//设置默认位置
MapStatusUpdate status = MapStatusUpdateFactory.newLatLng(GEO_ZHONGBEI);
map.getMap().setMapStatus(status);
//设置缩放级别
MapStatus.Builder builder = new MapStatus.Builder();
builder.zoom(16.5f);
map.getMap().setMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
drawLine();
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// TODO: inflate a fragment view
SDKInitializer.initialize(getActivity().getApplicationContext());
SDKInitializer.setCoordType(CoordType.BD09LL);
View rootView = super.onCreateView(inflater, container, savedInstanceState);
unbinder = ButterKnife.bind(this, rootView);
return rootView;
}
@Override
public void onDestroyView() {
super.onDestroyView();
unbinder.unbind();
}
@Override
public void onResume() {
super.onResume();
//在activity执行onResume时执行mMapView. onResume (),实现地图生命周期管理
map.onResume();
}
@Override
public void onPause() {
super.onPause();
//在activity执行onPause时执行mMapView. onPause (),实现地图生命周期管理
map.onPause();
}
@Override
public void onDestroy() {
super.onDestroy();
//在activity执行onDestroy时执行mMapView.onDestroy(),实现地图生命周期管理
map.onDestroy();
}
/**
* 轨迹
*/
private void drawLine() {
// LatLng p1 = new LatLng(38.019467, 112.455778);
// LatLng p2 = new LatLng(38.019467, 112.465778);1
// LatLng p3 = new LatLng(38.019467, 112.455978);
List<LatLng> points = new ArrayList<LatLng>();
// points.add(p1);
// points.add(p2);
// points.add(p3);
//设置折线的属性
OverlayOptions mOverlayOptions = new PolylineOptions()
.width(10)
.color(0xAAFF0000)
.points(points);
//在地图上绘制折线
//mPloyline 折线对象
Overlay mPolyline = map.getMap().addOverlay(mOverlayOptions);
}
}

View File

@@ -67,7 +67,7 @@ public class LoginActivity extends BaseActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.login_btn_login:
Intent intent = new Intent(LoginActivity.this, OldPeopleMainActivity.class);
Intent intent = new Intent(LoginActivity.this, ChildMainActivity.class);
startActivity(intent);
finish();
break;

View File

@@ -0,0 +1,9 @@
package com.scorpiomiku.oldpeoplehome.utils;
/**
* Created by ScorpioMiku on 2019/9/4.
*/
public class WebUtils {
}

View File

@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</android.support.constraint.ConstraintLayout>
<com.baidu.mapapi.map.MapView
android:id="@+id/map"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true">
</com.baidu.mapapi.map.MapView>
</LinearLayout>