From 9a15d7f09d070bddf695148c3c6f567335b5be43 Mon Sep 17 00:00:00 2001
From: ScorpioMiku <1056992492@qq.com>
Date: Wed, 21 Aug 2019 16:06:49 +0800
Subject: [PATCH] drawer
---
.../children/activity/ChildMainActivity.java | 6 ++--
.../children/fragment/MapFragment.java | 32 +++++++++++++++++++
.../app/src/main/res/drawable/ic_map.xml | 4 +++
.../main/res/layout/activity_child_main.xml | 2 +-
.../main/res/layout/fragment_child_map.xml | 6 ++++
.../app/src/main/res/menu/childmain.xml | 29 +++++++++++++++++
android/图标/地图 (1).svg | 1 +
android/图标/地图.svg | 1 +
8 files changed, 78 insertions(+), 3 deletions(-)
create mode 100644 android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java
create mode 100644 android/OldPeopleHome/app/src/main/res/drawable/ic_map.xml
create mode 100644 android/OldPeopleHome/app/src/main/res/layout/fragment_child_map.xml
create mode 100644 android/OldPeopleHome/app/src/main/res/menu/childmain.xml
create mode 100644 android/图标/地图 (1).svg
create mode 100644 android/图标/地图.svg
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java
index 0b18643..327f165 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java
@@ -23,6 +23,7 @@ import com.scorpiomiku.oldpeoplehome.base.BaseActivity;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
import com.scorpiomiku.oldpeoplehome.modules.children.fragment.EnvironmentFragment;
import com.scorpiomiku.oldpeoplehome.modules.children.fragment.HeartRateFragment;
+import com.scorpiomiku.oldpeoplehome.modules.children.fragment.MapFragment;
import com.scorpiomiku.oldpeoplehome.modules.children.fragment.MyInformationFragment;
import com.scorpiomiku.oldpeoplehome.modules.children.fragment.SleepFragment;
import com.scorpiomiku.oldpeoplehome.modules.children.fragment.StepFragment;
@@ -54,7 +55,7 @@ public class ChildMainActivity extends BaseActivity {
new SleepFragment(),
new HeartRateFragment(),
new EnvironmentFragment(),
- new MyInformationFragment()
+ new MapFragment()
};
private int[] barColors = {
R.color.step_bg,
@@ -96,9 +97,10 @@ public class ChildMainActivity extends BaseActivity {
case R.id.navigation_environmental:
changeFragment(3);
return true;
- case R.id.navigation_user:
+ case R.id.navigation_map:
changeFragment(4);
return true;
+
}
return false;
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java
new file mode 100644
index 0000000..12dbb26
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java
@@ -0,0 +1,32 @@
+package com.scorpiomiku.oldpeoplehome.modules.children.fragment;
+
+import android.os.Handler;
+
+import com.scorpiomiku.oldpeoplehome.R;
+import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
+
+/**
+ * Created by ScorpioMiku on 2019/8/21.
+ */
+
+public class MapFragment extends BaseFragment {
+ @Override
+ protected Handler initHandle() {
+ return null;
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.fragment_child_map;
+ }
+
+ @Override
+ protected void refreshData() {
+
+ }
+
+ @Override
+ protected void initView() {
+
+ }
+}
diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_map.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..fa6f868
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml b/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml
index 6d4d74c..cdb3170 100644
--- a/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml
+++ b/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml
@@ -78,6 +78,6 @@
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
android:background="?android:attr/windowBackground"
- app:menu="@menu/oldpeoplemain" />
+ app:menu="@menu/childmain" />
diff --git a/android/OldPeopleHome/app/src/main/res/layout/fragment_child_map.xml b/android/OldPeopleHome/app/src/main/res/layout/fragment_child_map.xml
new file mode 100644
index 0000000..d8fb324
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/layout/fragment_child_map.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/android/OldPeopleHome/app/src/main/res/menu/childmain.xml b/android/OldPeopleHome/app/src/main/res/menu/childmain.xml
new file mode 100644
index 0000000..051ebd2
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/menu/childmain.xml
@@ -0,0 +1,29 @@
+
+
diff --git a/android/图标/地图 (1).svg b/android/图标/地图 (1).svg
new file mode 100644
index 0000000..507425c
--- /dev/null
+++ b/android/图标/地图 (1).svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/android/图标/地图.svg b/android/图标/地图.svg
new file mode 100644
index 0000000..03ab552
--- /dev/null
+++ b/android/图标/地图.svg
@@ -0,0 +1 @@
+
\ No newline at end of file