inter server

This commit is contained in:
ScorpioMiku
2019-09-06 21:22:03 +08:00
parent 13717715de
commit 5184cd4ee6
35 changed files with 2091 additions and 805 deletions

View File

@@ -161,33 +161,36 @@
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="59" column="30" lean-forward="true" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
<folding>
<element signature="e#2251#2252#0" expanded="true" />
</folding>
<state relative-caret-position="550">
<caret line="59" column="30" lean-forward="false" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
<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">
<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="461">
<caret line="252" column="27" lean-forward="false" selection-start-line="252" selection-start-column="27" selection-end-line="252" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MapFragment.java" pinned="false" current-in-tab="false">
<file leaf-file-name="MapFragment.java" pinned="false" current-in-tab="true">
<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="2046">
<caret line="121" column="5" lean-forward="false" selection-start-line="121" selection-start-column="5" selection-end-line="121" selection-end-column="5" />
<folding />
<state relative-caret-position="22">
<caret line="62" column="35" lean-forward="false" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
<folding>
<element signature="e#1705#1706#0" expanded="false" />
<element signature="e#1722#2027#0" expanded="true" />
<element signature="e#2026#2027#0" expanded="true" />
<element signature="e#2033#2034#0" expanded="false" />
<element signature="e#2391#2392#0" expanded="true" />
<element signature="e#2452#2453#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -195,51 +198,48 @@
<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="2860">
<state relative-caret-position="519">
<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>
</file>
<file leaf-file-name="SleepViewPagerItem.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/SleepViewPagerItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
<caret line="77" column="29" lean-forward="false" selection-start-line="77" selection-start-column="19" selection-end-line="77" selection-end-column="29" />
<folding>
<element signature="e#1841#1842#0" expanded="true" />
<element signature="e#1883#1884#0" expanded="true" />
<element signature="e#1935#1936#0" expanded="true" />
<element signature="e#1962#1963#0" expanded="true" />
<element signature="e#2011#2012#0" expanded="true" />
<element signature="e#2062#2063#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OldPeopleMainActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1430">
<caret line="117" column="28" lean-forward="false" selection-start-line="117" selection-start-column="28" selection-end-line="117" selection-end-column="28" />
<state relative-caret-position="395">
<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>
</file>
<file leaf-file-name="fragment_sleep_item.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_sleep_item.xml">
<file leaf-file-name="Location.java" pinned="false" current-in-tab="false">
<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="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" />
<folding />
<state relative-caret-position="123">
<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>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
</file>
</leaf>
@@ -257,7 +257,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>duan'ka</find>
<find>断开</find>
<find>断开li</find>
<find>断开lian</find>
@@ -287,6 +286,7 @@
<find>&quot;</find>
<find>parent</find>
<find>&quot;parent</find>
<find>latitu</find>
</findStrings>
<replaceStrings>
<replace>@color/choosed</replace>
@@ -2095,7 +2095,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_heart_rate.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout-v21/fragment_old_heart_rate.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_sleep.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_old_environment.xml" />
@@ -2105,7 +2104,6 @@
<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/modules/children/fragment/MapFragment.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" />
@@ -2135,7 +2133,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/OldPeople.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/StepFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/OldPeopleHome.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_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" />
@@ -2146,6 +2143,9 @@
<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/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/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/MapFragment.java" />
</list>
</option>
</component>
@@ -2170,6 +2170,241 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="AndroidView">
<subPane>
<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="Gradle Scripts" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidBuildScriptsGroupNode" />
</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>
<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>
<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>
<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>
<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>
<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>
<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="children" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fragment" />
<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="children" />
<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="bean" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
@@ -2240,105 +2475,12 @@
</subPane>
</pane>
<pane id="Scope" />
<pane id="AndroidView">
<subPane>
<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="Gradle Scripts" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidBuildScriptsGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OldPeopleHome" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
</PATH>
<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>
<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>
<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>
<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" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="android.sdk.path" value="E:/androidSDK" />
<property name="settings.editor.selected.configurable" value="android.sdk-updates" />
<property name="device.picker.selection" value="B2T7N16C11002906" />
<property name="device.picker.selection" value="1eb614dd" />
<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="E:/androidprogrames/CloudClass" />
@@ -2457,8 +2599,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="1567757551525" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775053677" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -2505,8 +2646,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="1567757551526" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775053677" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
@@ -2540,6 +2680,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 />
@@ -2667,8 +2828,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="1567757551527" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775053677" />
</method>
</configuration>
<list size="2">
@@ -2728,7 +2888,7 @@
<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="false" 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="true" 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="7" side_tool="true" content_ui="tabs" />
@@ -2738,8 +2898,8 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="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="true" 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="false" show_stripe_button="true" weight="0.32900432" 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="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="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="4" 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" />
@@ -2772,16 +2932,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_register.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<caret line="204" column="40" lean-forward="false" selection-start-line="204" selection-start-column="40" selection-end-line="204" selection-end-column="40" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Child.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
@@ -3017,15 +3167,15 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="52" column="38" lean-forward="false" selection-start-line="52" selection-start-column="38" selection-end-line="52" selection-end-column="38" />
<folding />
</state>
</provider>
<provider editor-type-id="android-manifest">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor">
@@ -3100,13 +3250,6 @@
</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="409">
<caret line="24" column="5" lean-forward="false" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
</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">
@@ -3156,30 +3299,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1430">
<caret line="117" column="28" lean-forward="false" selection-start-line="117" selection-start-column="28" selection-end-line="117" selection-end-column="28" />
<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/children/fragment/MapFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2046">
<caret line="121" column="5" lean-forward="false" selection-start-line="121" selection-start-column="5" selection-end-line="121" selection-end-column="5" />
<folding />
</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="2046">
@@ -3209,23 +3328,85 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="59" column="30" lean-forward="true" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
<folding>
<element signature="e#2251#2252#0" expanded="true" />
</folding>
<state relative-caret-position="550">
<caret line="59" column="30" lean-forward="false" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
<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" />
<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="461">
<caret line="252" column="27" lean-forward="false" selection-start-line="252" selection-start-column="27" selection-end-line="252" selection-end-column="27" />
<state relative-caret-position="615">
<caret line="276" column="5" lean-forward="false" selection-start-line="276" selection-start-column="5" selection-end-line="276" 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/bean/Location.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="123">
<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="519">
<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="395">
<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/children/fragment/MapFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="62" column="35" lean-forward="false" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
<folding>
<element signature="e#1705#1706#0" expanded="false" />
<element signature="e#1722#2027#0" expanded="true" />
<element signature="e#2026#2027#0" expanded="true" />
<element signature="e#2033#2034#0" expanded="false" />
<element signature="e#2391#2392#0" expanded="true" />
<element signature="e#2452#2453#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

View File

@@ -0,0 +1,58 @@
package com.scorpiomiku.oldpeoplehome.bean;
import android.support.annotation.NonNull;
/**
* Created by ScorpioMiku on 2019/9/6.
*/
public class Location {
private String parent;
private String longitude;
private String latitude;
private String time;
@Override
public String toString() {
return "Location{" +
"parent='" + parent + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", time='" + time + '\'' +
'}';
}
public String getParent() {
return parent;
}
public void setParent(String parent) {
this.parent = parent;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
}

View File

@@ -1,7 +1,9 @@
package com.scorpiomiku.oldpeoplehome.modules.children.fragment;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -16,15 +18,26 @@ 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.google.gson.Gson;
import com.google.gson.JsonArray;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
import com.scorpiomiku.oldpeoplehome.bean.Location;
import com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity.OldPeopleMainActivity;
import com.scorpiomiku.oldpeoplehome.utils.LogUtils;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.Response;
/**
* Created by ScorpioMiku on 2019/8/21.
@@ -36,9 +49,22 @@ public class MapFragment extends BaseFragment {
Unbinder unbinder;
LatLng GEO_ZHONGBEI = new LatLng(38.019467, 112.455778);
private ArrayList<Location> locations = new ArrayList<>();
@SuppressLint("HandlerLeak")
@Override
protected Handler initHandle() {
return null;
return new Handler() {
@Override
public void handleMessage(Message msg) {
super.handleMessage(msg);
switch (msg.what) {
case 1:
drawLine();
break;
}
}
};
}
@Override
@@ -48,7 +74,26 @@ public class MapFragment extends BaseFragment {
@Override
protected void refreshData() {
getWebUtils().getLocation(((OldPeopleMainActivity) getActivity()).getOldPeopleUser().getParentId(), new Callback() {
@Override
public void onFailure(Call call, IOException e) {
LogUtils.loge(e.getMessage());
}
@Override
public void onResponse(Call call, Response response) throws IOException {
try {
JsonArray jsonElements = getWebUtils().getJsonArray(response);
Gson gson = new Gson();
Location[] locas = gson.fromJson(jsonElements, Location[].class);
locations.clear();
locations.addAll(Arrays.asList(locas));
handler.sendEmptyMessage(1);
} catch (Exception e) {
LogUtils.loge(e.getMessage());
}
}
});
}
@Override
@@ -60,7 +105,6 @@ public class MapFragment extends BaseFragment {
MapStatus.Builder builder = new MapStatus.Builder();
builder.zoom(16.5f);
map.getMap().setMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
drawLine();
}
@Override
@@ -104,13 +148,13 @@ public class MapFragment extends BaseFragment {
* 轨迹
*/
private void drawLine() {
LatLng p1 = new LatLng(38.019467, 112.455778);
LatLng p2 = new LatLng(38.019467, 112.465778);
LatLng p3 = new LatLng(38.019467, 112.455978);
List<LatLng> points = new ArrayList<LatLng>();
points.add(p1);
points.add(p2);
points.add(p3);
for (int i = 0; i < locations.size(); i++) {
points.add(new LatLng(
Double.valueOf(locations.get(i).getLatitude()),
Double.valueOf(locations.get(i).getLongitude())
));
}
//设置折线的属性
OverlayOptions mOverlayOptions = new PolylineOptions()
.width(10)

View File

@@ -28,6 +28,7 @@ import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseActivity;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
import com.scorpiomiku.oldpeoplehome.bean.BleDeviceItem;
import com.scorpiomiku.oldpeoplehome.bean.Location;
import com.scorpiomiku.oldpeoplehome.bean.OldPeople;
import com.scorpiomiku.oldpeoplehome.bean.SportData;
import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.EnvironmentFragment;
@@ -43,16 +44,21 @@ import com.scorpiomiku.oldpeoplehome.utils.TimeUtils;
import com.sxr.sdk.ble.keepfit.aidl.IRemoteService;
import com.sxr.sdk.ble.keepfit.aidl.IServiceCallback;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.Response;
/**
* Created by ScorpioMiku on 2019/8/18.
@@ -80,6 +86,8 @@ public class OldPeopleMainActivity extends BaseActivity {
private String bloodPressureDiastole = "0";
private String oxygen;
private Location location;
private Boolean mIsBound = false;
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener;
@@ -116,6 +124,22 @@ public class OldPeopleMainActivity extends BaseActivity {
break;
case 3:
//定位
data.clear();
data.put("parent", location.getParent());
data.put("longitude", location.getLongitude());
data.put("latitude", location.getLatitude());
data.put("time", location.getTime());
getWebUtils().upLocation(data, new okhttp3.Callback() {
@Override
public void onFailure(Call call, IOException e) {
LogUtils.loge(e.getMessage());
}
@Override
public void onResponse(Call call, Response response) throws IOException {
LogUtils.logd("上传位置成功");
}
});
break;
}
}
@@ -730,6 +754,11 @@ public class OldPeopleMainActivity extends BaseActivity {
//获取定位类型、定位错误返回码具体信息可参照类参考中BDLocation类中的说明
int errorCode = bdLocation.getLocType();
LogUtils.logd(latitude + ";" + longitude + ";" + radius + ";" + coorType + ";" + errorCode);
location = new Location();
location.setLatitude(latitude + "");
location.setLongitude(longitude + "");
location.setParent(getOldPeopleUser().getParentId());
location.setTime(TimeUtils.getTime());
handler.sendEmptyMessage(3);
}
});

View File

@@ -249,6 +249,30 @@ public class WebUtils {
Call call = mClient.newCall(request);
call.enqueue(callback);
}
//
// public void upLocation()
/**
* 上传坐标
*
* @param hashMap
* @param callback
*/
public void upLocation(HashMap<String, String> hashMap, Callback callback) {
Request request = new Request.Builder().post(getRequestBody(hashMap))
.url(webHost + "/location/add/").build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
/**
* 获取坐标
*
* @param parentId
* @param callback
*/
public void getLocation(String parentId, Callback callback) {
Request request = new Request.Builder()
.url(webHost + "/location/get/" + parentId).build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
}

View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="gson-2.2.2">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../okhttpTest/gson-2.2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="okhttp-3.5.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../okhttpTest/okhttp-3.5.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="okio-1.11.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../okhttpTest/okio-1.11.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/OldPeopleInterServer.iml" filepath="$PROJECT_DIR$/OldPeopleInterServer.iml" />
</modules>
</component>
</project>

View File

@@ -0,0 +1,450 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e14eed3f-19c7-4682-a833-d377ab2a08a3" name="Default" comment="" />
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#788#789#0" expanded="true" />
<element signature="e#878#879#0" expanded="true" />
<element signature="e#2341#2342#0" expanded="true" />
<element signature="e#2447#2448#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Node.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="21" column="46" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="funcList.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RoomData.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TimeUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="51" column="44" selection-start-line="51" selection-start-column="44" selection-end-line="51" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>com.scorpiomiku.wifitrick.</find>
</findStrings>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/WebUtils.java" />
<option value="$PROJECT_DIR$/src/RoomData.java" />
<option value="$PROJECT_DIR$/src/TimeUtils.java" />
<option value="$PROJECT_DIR$/src/funcList.java" />
<option value="$PROJECT_DIR$/src/Node.java" />
<option value="$PROJECT_DIR$/src/Main.java" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="OldPeopleInterServer" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleInterServer" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleInterServer" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleInterServer" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../okhttpTest/gson-2.2.2.jar!/" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Libraries" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\javaprogrames\OldPeopleInterServer\src" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" />
<module name="OldPeopleInterServer" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<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" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="OUTPUT_DIRECTORY" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<properties />
<listeners />
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.Main" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="e14eed3f-19c7-4682-a833-d377ab2a08a3" name="Default" comment="" />
<created>1567753931598</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1567753931598</updated>
<workItem from="1567753939083" duration="1386000" />
<workItem from="1567775235491" duration="855000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2241000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<layout>
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Messages" order="7" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" weight="0.2657952" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Mongo Explorer" order="3" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12526652" />
<window_info anchor="right" id="Database" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="2" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="1" />
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="3" selection-start-line="3" selection-end-line="3" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#788#789#0" expanded="true" />
<element signature="e#878#879#0" expanded="true" />
<element signature="e#2341#2342#0" expanded="true" />
<element signature="e#2447#2448#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="51" column="44" selection-start-line="51" selection-start-column="44" selection-end-line="51" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="21" column="46" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#788#789#0" expanded="true" />
<element signature="e#878#879#0" expanded="true" />
<element signature="e#2341#2342#0" expanded="true" />
<element signature="e#2447#2448#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<last-edited>No facets are configured</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>OldPeopleInterServer</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>gson-2.2.2</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

View File

@@ -0,0 +1,70 @@
import com.google.gson.Gson;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.Response;
import java.io.IOException;
public class Main {
private static String isin;
private static String temporature;
private static String humidity;
private static WebUtils webUtils;
public static void main(String[] args) {
webUtils = WebUtils.getInstance();
System.out.println("开始转发任务");
getAndUpData();
}
private static void getAndUpData() {
new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(2000);
webUtils.getRoomData(new Callback() {
@Override
public void onFailure(Call call, IOException e) {
System.out.println(e.getMessage());
}
@Override
public void onResponse(Call call, Response response) throws IOException {
String body = response.body().string();
Gson gson = new Gson();
Node[] nodes = gson.fromJson(body, Node[].class);
for (Node node : nodes) {
funcList[] funcLists = node.getFuncList();
for (funcList funcList : funcLists) {
if (funcList.getType().equals("安防")) {
isin = String.valueOf((int) funcList.getData());
} else if (funcList.getType().equals("温度")) {
temporature = String.valueOf(funcList.getData());
} else if (funcList.getType().equals("湿度")) {
humidity = String.valueOf(funcList.getData());
}
}
}
RoomData roomData = new RoomData(isin, temporature, humidity, TimeUtils.getTime(), "1");
webUtils.upRoomState(roomData.getMap(), new Callback() {
@Override
public void onFailure(Call call, IOException e) {
System.out.println(e.getMessage());
}
@Override
public void onResponse(Call call, Response response) throws IOException {
System.out.println("上传成功:" + roomData.toString());
getAndUpData();
}
});
}
});
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}).start();
}
}

View File

@@ -0,0 +1,54 @@
/**
* Created by ScorpioMiku on 2019/9/3.
*/
public class Node {
private String nwkAddr;
private String parAddr;
private String macAddr;
private funcList[] funcList;
public funcList[] getFuncList() {
return funcList;
}
public void setFuncList(funcList[] funcList) {
this.funcList = funcList;
}
@Override
public String toString() {
return "Node{" +
"nwkAddr='" + nwkAddr + '\'' +
", parAddr='" + parAddr + '\'' +
", macAddr='" + macAddr + '\'' +
", funcList=" + funcList +
'}';
}
public String getNwkAddr() {
return nwkAddr;
}
public void setNwkAddr(String nwkAddr) {
this.nwkAddr = nwkAddr;
}
public String getParAddr() {
return parAddr;
}
public void setParAddr(String parAddr) {
this.parAddr = parAddr;
}
public String getMacAddr() {
return macAddr;
}
public void setMacAddr(String macAddr) {
this.macAddr = macAddr;
}
}

View File

@@ -0,0 +1,82 @@
import java.util.HashMap;
/**
* Created by ScorpioMiku on 2019/9/3.
*/
public class RoomData {
private String isin;
private String temporature;
private String humidity;
private String time;
private String roomId;
public RoomData(String isin, String temporature, String humidity, String time, String roomId) {
this.isin = isin;
this.temporature = temporature;
this.humidity = humidity;
this.time = time;
this.roomId = roomId;
}
public HashMap<String, String> getMap() {
HashMap<String, String> mapData = new HashMap<>();
mapData.put("roomId", getRoomId());
mapData.put("time", TimeUtils.getTime());
mapData.put("temperature", getTemporature());
mapData.put("humidity", getHumidity());
mapData.put("isin", getIsin());
return mapData;
}
public String getIsin() {
return isin;
}
public void setIsin(String isin) {
this.isin = isin;
}
public String getTemporature() {
return temporature;
}
public void setTemporature(String temporature) {
this.temporature = temporature;
}
public String getHumidity() {
return humidity;
}
public void setHumidity(String humidity) {
this.humidity = humidity;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
public String getRoomId() {
return roomId;
}
public void setRoomId(String roomId) {
this.roomId = roomId;
}
@Override
public String toString() {
return "RoomData{" +
"isin='" + isin + '\'' +
", temporature='" + temporature + '\'' +
", humidity='" + humidity + '\'' +
", time='" + time + '\'' +
", roomId='" + roomId + '\'' +
'}';
}
}

View File

@@ -0,0 +1,18 @@
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
/**
* Created by ScorpioMiku on 2019/9/3.
*/
public class TimeUtils {
public static String getTime() {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// HH:mm:ss
//获取当前时间
Date date = new Date(System.currentTimeMillis());
return simpleDateFormat.format(date);
}
}

View File

@@ -0,0 +1,61 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Set;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.FormBody;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
/**
* Created by ScorpioMiku on 2019/9/3.
*/
public class WebUtils {
private static final String TAG = "WebUtils";
private static WebUtils instance = new WebUtils();
private static OkHttpClient mClient = new OkHttpClient();
private static final String webHost = "http://39.105.65.209:8080";
private WebUtils() {
}
public static WebUtils getInstance() {
return instance;
}
public RequestBody getRequestBody(HashMap<String, String> data) {
String body = "";
MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
Set<String> keys = data.keySet();
for (String key : keys) {
body += key + "=" + data.get(key) + "&";
}
body = body.substring(0, body.length() - 1);
RequestBody requestBody = RequestBody.create(mediaType, body);
return requestBody;
}
public void upRoomState(HashMap<String, String> hashMap, Callback callback) {
Request request = new Request.Builder().post(getRequestBody(hashMap))
.url(webHost + "/rstate/add/").build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
public void getRoomData(Callback callback) {
Request request = new Request.Builder()
.url("http://192.168.0.1/cgi-bin/node.cgi")
.build();
Call call = mClient.newCall(request);
call.enqueue(callback);
}
}

View File

@@ -0,0 +1,55 @@
import java.util.HashMap;
/**
* Created by ScorpioMiku on 2019/9/3.
*/
public class funcList {
private String typeCode;
private String type;
private float cycle;
private float data;
@Override
public String toString() {
return "funcList{" +
"typeCode='" + typeCode + '\'' +
", type='" + type + '\'' +
", cycle=" + cycle +
", data=" + data +
'}';
}
public String getTypeCode() {
return typeCode;
}
public void setTypeCode(String typeCode) {
this.typeCode = typeCode;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public float getCycle() {
return cycle;
}
public void setCycle(float cycle) {
this.cycle = cycle;
}
public float getData() {
return data;
}
public void setData(float data) {
this.data = data;
}
}

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="android.arch.core:common:1.0.0@jar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.0.0/a2d487452376193fc8c103dd2b9bd5f2b1b44563/common-1.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.0.0/a41fa3b9a66f3bdd41f98013a1688e969072aaf2/common-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="android.arch.lifecycle:common:1.0.0@jar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.0.0/e414a4cb28434e25c4f6aa71426eb20cf4874ae9/common-1.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.0.0/39ce4055689b4b766478265a8c661f4165f26dc3/common-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="android.arch.lifecycle:runtime-1.0.0">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/aaa1b57bd552bbf8ba82ec1599a38b91/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/aaa1b57bd552bbf8ba82ec1599a38b91/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.0.0/1dd0298d8c45d8dfa4d038270247327f23df7a3a/runtime-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:animated-vector-drawable-26.1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/e000b7ea2dbfa67e7edb770d2c38abf7/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/e000b7ea2dbfa67e7edb770d2c38abf7/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/animated-vector-drawable/26.1.0/91743e9b07667784f471a3c4748e6883cd810084/animated-vector-drawable-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:appcompat-v7-26.1.0">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/9692b2e8dc5f8180735131fff58e5e86/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/9692b2e8dc5f8180735131fff58e5e86/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/appcompat-v7/26.1.0/2b34456c30d6b6e5db5fa3e8fa02f6cebd5531fd/appcompat-v7-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-annotations:26.1.0@jar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/26.1.0/814258103cf26a15fcc26ecce35f5b7d24b73f8/support-annotations-26.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/26.1.0/29ca6aaf2d4976c13dd7c836e91bd2a61b697bf3/support-annotations-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-compat-26.1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/e7e85648284485d1d25b6d42d6c14b7e/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/e7e85648284485d1d25b6d42d6c14b7e/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-compat/26.1.0/73bfdb5cca1949a51219d3676700996990ea3b52/support-compat-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-core-ui-26.1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/85ae674c3e112c22ebf0b3b403ab8f19/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/85ae674c3e112c22ebf0b3b403ab8f19/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-ui/26.1.0/4d52cef4a24bf9939de1d256ca9f0974c6e636a4/support-core-ui-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-core-utils-26.1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/d347dda4ed4237ae204c9c5ca05d21f6/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/d347dda4ed4237ae204c9c5ca05d21f6/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-utils/26.1.0/2b0c3da7f80880bbf365452b354490a77f085c96/support-core-utils-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-fragment-26.1.0">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/2651be039130210e105c7dff87360005/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/2651be039130210e105c7dff87360005/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-fragment/26.1.0/8279b00f5194701ff18363fa2958c5a26670b0ef/support-fragment-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-media-compat-26.1.0">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/052381a9c89d20584a849d07c5ea5d68/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/052381a9c89d20584a849d07c5ea5d68/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-media-compat/26.1.0/774fd1164ec32514eec562953f723a1920a7fef7/support-media-compat-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-v4-26.1.0">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/fb63478598190d56b716f6d57689b24f/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/fb63478598190d56b716f6d57689b24f/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-v4/26.1.0/9c53eab3272b3b26583b17facac2e90d264b2788/support-v4-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.support:support-vector-drawable-26.1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/e4dc5b86958a76374e04a6ba735e5f76/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/e4dc5b86958a76374e04a6ba735e5f76/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-vector-drawable/26.1.0/7a59c417eb560e5ddc2de20792ad45b38e422a5b/support-vector-drawable-26.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -6,6 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
<component name="ChangeListManager">
@@ -31,22 +32,23 @@
</system>
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<state relative-caret-position="299">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding>
<element signature="e#1773#2259#0" expanded="true" />
<element signature="e#2258#2259#0" expanded="true" />
<element signature="e#2640#2787#0" expanded="true" />
<element signature="e#2786#2787#0" expanded="true" />
<element signature="e#3266#3581#0" expanded="true" />
<element signature="e#3580#3581#0" expanded="true" />
<element signature="e#3668#3669#0" expanded="true" />
<element signature="e#3716#3717#0" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="styles.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
@@ -64,27 +66,12 @@
</provider>
</entry>
</file>
<file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TimeUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="198">
<caret line="14" column="29" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
@@ -92,83 +79,23 @@
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="60" column="31" lean-forward="false" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
<state relative-caret-position="211">
<caret line="56" column="29" lean-forward="false" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WifiConnect.java" pinned="false" current-in-tab="false">
<file leaf-file-name="WifiConnect.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2151">
<caret line="102" column="17" lean-forward="false" selection-start-line="102" selection-start-column="17" selection-end-line="102" selection-end-column="17" />
<state relative-caret-position="385">
<caret line="133" column="34" lean-forward="true" selection-start-line="133" selection-start-column="34" selection-end-line="133" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1168#1476#0" expanded="true" />
<element signature="e#1475#1476#0" expanded="true" />
<element signature="e#2782#3137#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RoomData.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="519">
<caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding>
<element signature="e#937#938#0" expanded="true" />
<element signature="e#964#965#0" expanded="true" />
<element signature="e#1004#1005#0" expanded="true" />
<element signature="e#1036#1037#0" expanded="true" />
<element signature="e#1074#1075#0" expanded="true" />
<element signature="e#1108#1109#0" expanded="true" />
<element signature="e#1162#1163#0" expanded="true" />
<element signature="e#1208#1209#0" expanded="true" />
<element signature="e#1243#1244#0" expanded="true" />
<element signature="e#1274#1275#0" expanded="true" />
<element signature="e#1322#1323#0" expanded="true" />
<element signature="e#1362#1363#0" expanded="true" />
<element signature="e#1393#1394#0" expanded="true" />
<element signature="e#1420#1421#0" expanded="true" />
<element signature="e#1460#1461#0" expanded="true" />
<element signature="e#1492#1493#0" expanded="true" />
<element signature="e#1525#1526#0" expanded="true" />
<element signature="e#1554#1555#0" expanded="true" />
<element signature="e#1598#1599#0" expanded="true" />
<element signature="e#1634#1635#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="funcList.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="true" />
<element signature="e#657#658#0" expanded="true" />
<element signature="e#688#689#0" expanded="true" />
<element signature="e#715#716#0" expanded="true" />
<element signature="e#755#756#0" expanded="true" />
<element signature="e#787#788#0" expanded="true" />
<element signature="e#818#819#0" expanded="true" />
<element signature="e#846#847#0" expanded="true" />
<element signature="e#887#888#0" expanded="true" />
<element signature="e#921#922#0" expanded="true" />
<element signature="e#951#952#0" expanded="true" />
<element signature="e#978#979#0" expanded="true" />
<element signature="e#1017#1018#0" expanded="true" />
<element signature="e#1049#1050#0" expanded="true" />
</folding>
</state>
</provider>
@@ -178,38 +105,44 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="63" lean-forward="false" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" />
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding>
<element signature="e#284#285#0" expanded="true" />
<element signature="e#315#316#0" expanded="true" />
<element signature="e#753#754#0" expanded="true" />
<element signature="e#783#784#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
<element signature="e#867#868#0" expanded="true" />
<element signature="e#901#902#0" expanded="true" />
<element signature="e#931#932#0" expanded="true" />
<element signature="e#977#978#0" expanded="true" />
<element signature="e#1015#1016#0" expanded="true" />
<element signature="e#1049#1050#0" expanded="true" />
<element signature="e#1079#1080#0" expanded="true" />
<element signature="e#1125#1126#0" expanded="true" />
<element signature="e#1163#1164#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="NetworkReceiver.java" pinned="false" current-in-tab="true">
<file leaf-file-name="RoomData.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="funcList.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="NetworkReceiver.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/NetworkReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="379">
<caret line="86" column="47" lean-forward="true" selection-start-line="86" selection-start-column="47" selection-end-line="86" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1130#1393#0" expanded="true" />
<element signature="e#1392#1393#0" expanded="true" />
<element signature="e#3806#3807#0" expanded="true" />
<element signature="e#5221#5248#0" expanded="true" />
</folding>
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
@@ -1979,16 +1912,17 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/w.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/NetworkReceiver.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="x" value="1912" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
@@ -2009,7 +1943,6 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane" />
<pane id="AndroidView">
<subPane>
<PATH>
@@ -2035,6 +1968,10 @@
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="values" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -2049,10 +1986,6 @@
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layout" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -2099,6 +2032,7 @@
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="ProjectPane" />
<pane id="Scratches" />
</panes>
</component>
@@ -2106,6 +2040,7 @@
<property name="android.sdk.path" value="E:/androidSDK" />
<property name="settings.editor.selected.configurable" value="android.sdk-updates" />
<property name="device.picker.selection" value="B2T7N16C11002906" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -2188,7 +2123,9 @@
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method />
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775885726" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
<module name="" />
@@ -2233,7 +2170,9 @@
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
</Profilers>
<method />
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775885726" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@@ -2266,27 +2205,6 @@
</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 />
@@ -2413,7 +2331,9 @@
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method />
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775885727" />
</method>
</configuration>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Android App.app" />
@@ -2454,40 +2374,41 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
<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="-1" 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="-1" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Logcat" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="-1" 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="-1" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" 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.33" 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.32896176" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" 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="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.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="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" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11247335" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" 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="Structure" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Device File Explorer" 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="-1" side_tool="true" 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.33" 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.32896176" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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="-1" 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.32900432" sideWeight="0.5" order="-1" 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="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="-1" 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.11247335" 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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" 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="-1" 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="-1" 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="-1" side_tool="true" content_ui="tabs" />
<window_info id="Device File Explorer" 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="true" 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="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" 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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="3" 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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@@ -2498,11 +2419,316 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/NetworkReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
</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="242">
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<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>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="68" lean-forward="false" selection-start-line="7" selection-start-column="68" selection-end-line="7" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="14" column="29" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1078">
<caret line="67" column="34" lean-forward="false" selection-start-line="67" selection-start-column="34" selection-end-line="67" selection-end-column="34" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="10" lean-forward="false" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2574">
<caret line="133" column="43" lean-forward="false" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/NetworkReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1936">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="68" lean-forward="false" selection-start-line="7" selection-start-column="68" selection-end-line="7" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="60" column="31" lean-forward="false" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1892">
<caret line="102" column="17" lean-forward="false" selection-start-line="102" selection-start-column="17" selection-end-line="102" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="63" lean-forward="false" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/NetworkReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1474">
<caret line="86" column="47" lean-forward="false" selection-start-line="86" selection-start-column="47" selection-end-line="86" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1936">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="68" lean-forward="false" selection-start-line="7" selection-start-column="68" selection-end-line="7" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="60" column="31" lean-forward="false" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1892">
<caret line="102" column="17" lean-forward="false" selection-start-line="102" selection-start-column="17" selection-end-line="102" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="63" lean-forward="false" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/NetworkReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1474">
<caret line="86" column="47" lean-forward="true" selection-start-line="86" selection-start-column="47" selection-end-line="86" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://E:/androidSDK/sources/android-26/android/net/wifi/ScanResult.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6278">
<caret line="31" column="47" lean-forward="false" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
@@ -2510,18 +2736,10 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="2853" column="28" lean-forward="false" selection-start-line="2853" selection-start-column="28" selection-end-line="2853" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="64" column="4" lean-forward="false" selection-start-line="64" selection-start-column="4" selection-end-line="64" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiUtils.java" />
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
@@ -2530,139 +2748,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="32" column="35" lean-forward="false" selection-start-line="32" selection-start-column="35" selection-end-line="32" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/w.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="1" lean-forward="true" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="63" lean-forward="false" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" />
<folding>
<element signature="e#315#316#0" expanded="true" />
<element signature="e#753#754#0" expanded="true" />
<element signature="e#783#784#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
<element signature="e#867#868#0" expanded="true" />
<element signature="e#901#902#0" expanded="true" />
<element signature="e#931#932#0" expanded="true" />
<element signature="e#977#978#0" expanded="true" />
<element signature="e#1015#1016#0" expanded="true" />
<element signature="e#1049#1050#0" expanded="true" />
<element signature="e#1079#1080#0" expanded="true" />
<element signature="e#1125#1126#0" expanded="true" />
<element signature="e#1163#1164#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/w.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="519">
<caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding>
<element signature="e#937#938#0" expanded="true" />
<element signature="e#964#965#0" expanded="true" />
<element signature="e#1004#1005#0" expanded="true" />
<element signature="e#1036#1037#0" expanded="true" />
<element signature="e#1074#1075#0" expanded="true" />
<element signature="e#1108#1109#0" expanded="true" />
<element signature="e#1162#1163#0" expanded="true" />
<element signature="e#1208#1209#0" expanded="true" />
<element signature="e#1243#1244#0" expanded="true" />
<element signature="e#1274#1275#0" expanded="true" />
<element signature="e#1322#1323#0" expanded="true" />
<element signature="e#1362#1363#0" expanded="true" />
<element signature="e#1393#1394#0" expanded="true" />
<element signature="e#1420#1421#0" expanded="true" />
<element signature="e#1460#1461#0" expanded="true" />
<element signature="e#1492#1493#0" expanded="true" />
<element signature="e#1525#1526#0" expanded="true" />
<element signature="e#1554#1555#0" expanded="true" />
<element signature="e#1598#1599#0" expanded="true" />
<element signature="e#1634#1635#0" expanded="true" />
</folding>
<state relative-caret-position="682">
<caret line="31" column="10" lean-forward="false" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="true" />
<element signature="e#657#658#0" expanded="true" />
<element signature="e#688#689#0" expanded="true" />
<element signature="e#715#716#0" expanded="true" />
<element signature="e#755#756#0" expanded="true" />
<element signature="e#787#788#0" expanded="true" />
<element signature="e#818#819#0" expanded="true" />
<element signature="e#846#847#0" expanded="true" />
<element signature="e#887#888#0" expanded="true" />
<element signature="e#921#922#0" expanded="true" />
<element signature="e#951#952#0" expanded="true" />
<element signature="e#978#979#0" expanded="true" />
<element signature="e#1017#1018#0" expanded="true" />
<element signature="e#1049#1050#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2151">
<caret line="102" column="17" lean-forward="false" selection-start-line="102" selection-start-column="17" selection-end-line="102" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1168#1476#0" expanded="true" />
<element signature="e#1475#1476#0" expanded="true" />
<element signature="e#2782#3137#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="60" column="31" lean-forward="false" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="220">
<caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
@@ -2677,33 +2787,77 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#1773#2259#0" expanded="true" />
<element signature="e#2258#2259#0" expanded="true" />
<element signature="e#2640#2787#0" expanded="true" />
<element signature="e#2786#2787#0" expanded="true" />
<element signature="e#3266#3581#0" expanded="true" />
<element signature="e#3580#3581#0" expanded="true" />
<element signature="e#3668#3669#0" expanded="true" />
<element signature="e#3716#3717#0" expanded="true" />
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/NetworkReceiver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="379">
<caret line="86" column="47" lean-forward="true" selection-start-line="86" selection-start-column="47" selection-end-line="86" selection-end-column="47" />
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding>
<element signature="e#284#285#0" expanded="true" />
<element signature="e#315#316#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="14" column="29" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="56" column="29" lean-forward="false" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="133" column="34" lean-forward="true" selection-start-line="133" selection-start-column="34" selection-end-line="133" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1130#1393#0" expanded="true" />
<element signature="e#1392#1393#0" expanded="true" />
<element signature="e#3806#3807#0" expanded="true" />
<element signature="e#5221#5248#0" expanded="true" />
</folding>
</state>
</provider>

View File

@@ -35,16 +35,6 @@ public class WebUtils {
return instance;
}
public static FormBody getBody(HashMap<String, String> data) {
FormBody.Builder bodyBuilder = new FormBody.Builder();
Set<String> keys = data.keySet();
for (String key : keys) {
bodyBuilder.add(key, data.get(key));
}
return bodyBuilder.build();
}
public static RequestBody getRequestBody(HashMap<String, String> data) {
String body = "";
MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
@@ -53,7 +43,6 @@ public class WebUtils {
body += key + "=" + data.get(key) + "&";
}
body = body.substring(0, body.length() - 1);
// Log.d(TAG, "getRequestBody: " + body);
RequestBody requestBody = RequestBody.create(mediaType, body);
return requestBody;
}

View File

@@ -1,7 +1,7 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

View File

@@ -35,19 +35,6 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/AndroidManifest.xml">
<provider editor-type-id="android-manifest">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/build.gradle">
<provider selected="true" editor-type-id="text-editor">
@@ -58,16 +45,6 @@
</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="352">
<caret line="16" column="1" lean-forward="false" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="settings.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor">
@@ -101,11 +78,40 @@
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/src/com/sxr/sdk/ble/keepfit/client/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2523">
<caret line="365" column="17" lean-forward="true" selection-start-line="365" selection-start-column="17" selection-end-line="365" selection-end-column="17" />
<state relative-caret-position="433">
<caret line="841" column="35" lean-forward="false" selection-start-line="841" selection-start-column="35" selection-end-line="841" selection-end-column="35" />
<folding>
<element signature="e#21873#22745#0" expanded="true" />
<element signature="e#22744#22745#0" expanded="true" />
<element signature="e#23594#24435#0" expanded="true" />
<element signature="e#24434#24435#0" expanded="true" />
<element signature="e#24483#24807#0" expanded="true" />
<element signature="e#24806#24807#0" expanded="true" />
<element signature="e#30843#30859#0" expanded="true" />
<element signature="e#30903#30922#0" expanded="true" />
<element signature="e#38267#38282#0" expanded="true" />
<element signature="e#51229#51958#0" expanded="true" />
<element signature="e#51957#51958#0" expanded="true" />
<element signature="e#51999#52262#0" expanded="true" />
<element signature="e#52261#52262#0" expanded="true" />
<element signature="e#52601#52852#0" expanded="true" />
<element signature="e#52851#52852#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" column="39" lean-forward="false" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="39" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
</file>
<file leaf-file-name="BleDeviceItem.java" pinned="false" current-in-tab="false">
@@ -148,6 +154,11 @@
<find>getCurSportData</find>
<find>id.sca</find>
<find>case</find>
<find>d</find>
<find>断开</find>
<find>Y1</find>
<find>R.id.disconnect</find>
<find>unbind</find>
</findStrings>
</component>
<component name="GradleLocalSettings">
@@ -1943,6 +1954,22 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="AndroidView">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="android-smartband-sdk-sxrblejy2" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Gradle Scripts" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidBuildScriptsGroupNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -1989,51 +2016,7 @@
</PATH>
</subPane>
</pane>
<pane id="AndroidView">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="android-smartband-sdk-sxrblejy2" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Gradle Scripts" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidBuildScriptsGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="android-smartband-sdk-sxrblejy2" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="android-smartband-sdk-sxrblejy2client" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="android-smartband-sdk-sxrblejy2" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="android-smartband-sdk-sxrblejy2client" />
<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="client" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2126,7 +2109,8 @@
<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="1567046242196" />
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567685636550" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -2173,7 +2157,8 @@
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
</Profilers>
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567046242196" />
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567685636550" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
@@ -2333,7 +2318,10 @@
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method />
<method>
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567685636551" />
</method>
</configuration>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Android App.android-smartband-sdk-sxrblejy2client" />
@@ -2374,10 +2362,10 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="7" />
<frame x="1912" 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.33" 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.30985916" sideWeight="0.5" order="8" 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" />
@@ -2421,6 +2409,102 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="1" lean-forward="false" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/settings.gradle">
<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>
<entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
<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>
<entry file="file://$PROJECT_DIR$/local.properties">
<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>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/src/com/sxr/sdk/ble/keepfit/client/BleDeviceItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="19" lean-forward="false" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/src/com/sxr/sdk/ble/keepfit/client/ComparatorBleDeviceItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/src/com/sxr/sdk/ble/keepfit/client/SampleBleService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/src/com/sxr/sdk/ble/keepfit/client/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6908">
<caret line="365" column="17" lean-forward="true" selection-start-line="365" selection-start-column="17" selection-end-line="365" selection-end-column="17" />
<folding>
<element signature="e#21873#22745#0" expanded="true" />
<element signature="e#22744#22745#0" expanded="true" />
<element signature="e#23594#24435#0" expanded="true" />
<element signature="e#24434#24435#0" expanded="true" />
<element signature="e#24483#24807#0" expanded="true" />
<element signature="e#24806#24807#0" expanded="true" />
<element signature="e#30843#30859#0" expanded="true" />
<element signature="e#30903#30922#0" expanded="true" />
<element signature="e#38267#38282#0" expanded="true" />
<element signature="e#51229#51958#0" expanded="true" />
<element signature="e#51957#51958#0" expanded="true" />
<element signature="e#51999#52262#0" expanded="true" />
<element signature="e#52261#52262#0" expanded="true" />
<element signature="e#52601#52852#0" expanded="true" />
<element signature="e#52851#52852#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
@@ -2433,7 +2517,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -2497,7 +2580,23 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804">
<caret line="133" column="38" lean-forward="false" selection-start-line="133" selection-start-column="38" selection-end-line="133" selection-end-column="38" />
<folding />
<folding>
<element signature="e#21873#22745#0" expanded="true" />
<element signature="e#22744#22745#0" expanded="true" />
<element signature="e#23594#24435#0" expanded="true" />
<element signature="e#24434#24435#0" expanded="true" />
<element signature="e#24483#24807#0" expanded="true" />
<element signature="e#24806#24807#0" expanded="true" />
<element signature="e#30843#30859#0" expanded="true" />
<element signature="e#30903#30922#0" expanded="true" />
<element signature="e#38267#38282#0" expanded="true" />
<element signature="e#51229#51958#0" expanded="true" />
<element signature="e#51957#51958#0" expanded="true" />
<element signature="e#51999#52262#0" expanded="true" />
<element signature="e#52261#52262#0" expanded="true" />
<element signature="e#52601#52852#0" expanded="true" />
<element signature="e#52851#52852#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -2513,7 +2612,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -2577,7 +2675,23 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27544">
<caret line="1252" column="46" lean-forward="false" selection-start-line="1252" selection-start-column="34" selection-end-line="1252" selection-end-column="46" />
<folding />
<folding>
<element signature="e#21873#22745#0" expanded="true" />
<element signature="e#22744#22745#0" expanded="true" />
<element signature="e#23594#24435#0" expanded="true" />
<element signature="e#24434#24435#0" expanded="true" />
<element signature="e#24483#24807#0" expanded="true" />
<element signature="e#24806#24807#0" expanded="true" />
<element signature="e#30843#30859#0" expanded="true" />
<element signature="e#30903#30922#0" expanded="true" />
<element signature="e#38267#38282#0" expanded="true" />
<element signature="e#51229#51958#0" expanded="true" />
<element signature="e#51957#51958#0" expanded="true" />
<element signature="e#51999#52262#0" expanded="true" />
<element signature="e#52261#52262#0" expanded="true" />
<element signature="e#52601#52852#0" expanded="true" />
<element signature="e#52851#52852#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -2592,7 +2706,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="6" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
@@ -2624,33 +2737,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="36" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/res/layout/device_listitem_text.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" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/res/values/styles.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -2697,13 +2798,6 @@
</state>
</provider>
</entry>
<entry file="jar://E:/androidSDK/platforms/android-21/android.jar!/android/content/ContextWrapper.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="306" column="25" lean-forward="false" selection-start-line="306" selection-start-column="25" selection-end-line="306" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/android-smartband-sdk-sxrblejy2aidl-release.aar/ceb0acd531a2bd0f655c2792c41b5a25/jars/classes.jar!/com/sxr/sdk/ble/keepfit/aidl/IRemoteService.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
@@ -2743,11 +2837,45 @@
</state>
</provider>
</entry>
<entry file="jar://E:/androidSDK/platforms/android-21/android.jar!/android/content/ContextWrapper.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="318" column="16" lean-forward="false" selection-start-line="318" selection-start-column="16" selection-end-line="318" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" column="39" lean-forward="false" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="39" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android-smartband-sdk-sxrblejy2client/src/com/sxr/sdk/ble/keepfit/client/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2523">
<caret line="365" column="17" lean-forward="true" selection-start-line="365" selection-start-column="17" selection-end-line="365" selection-end-column="17" />
<folding />
<state relative-caret-position="433">
<caret line="841" column="35" lean-forward="false" selection-start-line="841" selection-start-column="35" selection-end-line="841" selection-end-column="35" />
<folding>
<element signature="e#21873#22745#0" expanded="true" />
<element signature="e#22744#22745#0" expanded="true" />
<element signature="e#23594#24435#0" expanded="true" />
<element signature="e#24434#24435#0" expanded="true" />
<element signature="e#24483#24807#0" expanded="true" />
<element signature="e#24806#24807#0" expanded="true" />
<element signature="e#30843#30859#0" expanded="true" />
<element signature="e#30903#30922#0" expanded="true" />
<element signature="e#38267#38282#0" expanded="true" />
<element signature="e#51229#51958#0" expanded="true" />
<element signature="e#51957#51958#0" expanded="true" />
<element signature="e#51999#52262#0" expanded="true" />
<element signature="e#52261#52262#0" expanded="true" />
<element signature="e#52601#52852#0" expanded="true" />
<element signature="e#52851#52852#0" expanded="true" />
</folding>
</state>
</provider>
</entry>

View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1567602307103" class="icon" viewBox="0 0 1230 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2082" xmlns:xlink="http://www.w3.org/1999/xlink" width="240.234375" height="200"><defs><style type="text/css"></style></defs><path d="M733.165056 571.7504l20.224-25.9584a131.6352 131.6352 0 0 0-22.6816-184.7808l-155.648-121.6a131.6352 131.6352 0 0 0-184.7808 22.6816L147.129856 573.44a131.6352 131.6352 0 0 0 22.6816 184.7808l155.648 121.6a131.6352 131.6352 0 0 0 184.832-22.7328l80.9984-103.7312" fill="#FDA933" p-id="2083"></path><path d="M585.350656 386.6624l-20.224 25.9584a131.6352 131.6352 0 0 0 22.6816 184.832l155.648 121.5488a131.6352 131.6352 0 0 0 184.7808-22.6816l243.1488-311.296a131.6352 131.6352 0 0 0-22.6816-184.7808l-155.648-121.5488a131.6352 131.6352 0 0 0-184.832 22.6816l-80.9984 103.7312" fill="#FFDCAC" p-id="2084"></path><path d="M550.790656 805.1712l-40.3456-31.488-94.5664 121.0368a102.4 102.4 0 0 1-143.7696 17.6128l-181.5552-141.824a102.4 102.4 0 0 1-17.6128-143.7696l283.648-363.1104a102.4 102.4 0 0 1 143.7696-17.6128l181.5552 141.824a102.4 102.4 0 0 1 17.664 143.7696l-23.6544 30.208 40.3456 31.5392 23.6544-30.208a153.6 153.6 0 0 0-26.4704-215.6544l-181.5552-141.824a153.6 153.6 0 0 0-215.6032 26.4704L32.544256 595.2512a153.6 153.6 0 0 0 26.4704 215.552l181.5552 141.8752a153.6 153.6 0 0 0 215.552-26.4704l94.6176-121.0368z m0 0l-40.3456-31.488-94.5664 121.0368a102.4 102.4 0 0 1-143.7696 17.6128l-181.5552-141.824a102.4 102.4 0 0 1-17.6128-143.7696l283.648-363.1104a102.4 102.4 0 0 1 143.7696-17.6128l181.5552 141.824a102.4 102.4 0 0 1 17.664 143.7696l-23.6544 30.208 40.3456 31.5392 23.6544-30.208a153.6 153.6 0 0 0-26.4704-215.6544l-181.5552-141.824a153.6 153.6 0 0 0-215.6032 26.4704L32.544256 595.2512a153.6 153.6 0 0 0 26.4704 215.552l181.5552 141.8752a153.6 153.6 0 0 0 215.552-26.4704l94.6176-121.0368z" fill="#2A1212" p-id="2085"></path><path d="M639.673856 192.4096l40.3456 31.5392 94.5664-121.0368a102.4 102.4 0 0 1 143.7184-17.664l181.5552 141.824a102.4 102.4 0 0 1 17.664 143.7696l-283.648 363.1104a102.4 102.4 0 0 1-143.7696 17.664l-181.5552-141.824a102.4 102.4 0 0 1-17.664-143.7696l23.6544-30.2592-40.3456-31.5392-23.6544 30.2592a153.6 153.6 0 0 0 26.4704 215.6032l181.5552 141.824a153.6 153.6 0 0 0 215.6032-26.4192l283.6992-363.1104a153.6 153.6 0 0 0-26.4704-215.6032L949.843456 44.9536a153.6 153.6 0 0 0-215.6032 26.4192l-94.5664 121.0368z m0 0l40.3456 31.5392 94.5664-121.0368a102.4 102.4 0 0 1 143.7184-17.664l181.5552 141.824a102.4 102.4 0 0 1 17.664 143.7696l-283.648 363.1104a102.4 102.4 0 0 1-143.7696 17.664l-181.5552-141.824a102.4 102.4 0 0 1-17.664-143.7696l23.6544-30.2592-40.3456-31.5392-23.6544 30.2592a153.6 153.6 0 0 0 26.4704 215.6032l181.5552 141.824a153.6 153.6 0 0 0 215.6032-26.4192l283.6992-363.1104a153.6 153.6 0 0 0-26.4704-215.6032L949.843456 44.9536a153.6 153.6 0 0 0-215.6032 26.4192l-94.5664 121.0368z" fill="#2A1212" p-id="2086"></path></svg>

After

Width:  |  Height:  |  Size: 3.0 KiB