diff --git a/android/OldPeopleHome/app/build.gradle b/android/OldPeopleHome/app/build.gradle
index 52ee079..cfed34c 100644
--- a/android/OldPeopleHome/app/build.gradle
+++ b/android/OldPeopleHome/app/build.gradle
@@ -39,4 +39,8 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.9.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
implementation 'com.android.support:recyclerview-v7:27.1.1'
+
+ //横向进度条
+ implementation 'me.zhouzhuo.zzhorizontalprogressbar:zz-horizontal-progressbar:1.1.0'
+ implementation 'me.itangqi.waveloadingview:library:0.3.5'
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
index ca0c1cf..206dd08 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
@@ -21,6 +21,7 @@ import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.HeartRateFragmen
import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.MyInformationFragment;
import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.SleepFragment;
import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.StepFragment;
+import com.scorpiomiku.oldpeoplehome.utils.StatusBarUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -44,6 +45,13 @@ public class OldPeopleMainActivity extends BaseActivity {
new EnvironmentFragment(),
new MyInformationFragment()
};
+ private int[] barColors = {
+ R.color.step_bg,
+ R.color.sleep_bg,
+ R.color.heart_rate_bg,
+ R.color.environment_bg,
+ R.color.colorPrimaryDark
+ };
@Override
protected Handler initHandle() {
@@ -109,11 +117,13 @@ public class OldPeopleMainActivity extends BaseActivity {
fragmentTransaction.add(R.id.container, fragments[2]);
fragmentTransaction.add(R.id.container, fragments[3]);
fragmentTransaction.add(R.id.container, fragments[4]);
+
fragmentTransaction.hide(fragments[1]);
fragmentTransaction.hide(fragments[2]);
fragmentTransaction.hide(fragments[3]);
fragmentTransaction.hide(fragments[4]);
fragmentTransaction.commit();
+ StatusBarUtils.setWindowStatusBarColor(this, barColors[0]);
}
/**
@@ -126,6 +136,7 @@ public class OldPeopleMainActivity extends BaseActivity {
for (int i = 0; i < fragments.length; i++) {
if (i == index) {
fragmentTransaction.show(fragments[i]);
+ StatusBarUtils.setWindowStatusBarColor(this, barColors[i]);
} else {
fragmentTransaction.hide(fragments[i]);
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/StatusBarUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/StatusBarUtils.java
new file mode 100644
index 0000000..495f456
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/StatusBarUtils.java
@@ -0,0 +1,40 @@
+package com.scorpiomiku.oldpeoplehome.utils;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.os.Build;
+import android.view.Window;
+import android.view.WindowManager;
+
+/**
+ * Created by ScorpioMiku on 2019/8/18.
+ */
+
+public class StatusBarUtils {
+ //设置Activity对应的顶部状态栏的颜色
+ public static void setWindowStatusBarColor(Activity activity, int colorResId) {
+ try {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ Window window = activity.getWindow();
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ window.setStatusBarColor(activity.getResources().getColor(colorResId));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ //设置Dialog对应的顶部状态栏的颜色
+ public static void setWindowStatusBarColor(Dialog dialog, int colorResId) {
+ try {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ Window window = dialog.getWindow();
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ window.setStatusBarColor(dialog.getContext().getResources().getColor(colorResId));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java
new file mode 100644
index 0000000..10c1ce9
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/TimeUtils.java
@@ -0,0 +1,21 @@
+package com.scorpiomiku.oldpeoplehome.utils;
+
+import android.annotation.SuppressLint;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by ScorpioMiku on 2019/8/18.
+ */
+
+public class TimeUtils {
+ public static String getTime() {
+ @SuppressLint("SimpleDateFormat") SimpleDateFormat simpleDateFormat
+ = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");// HH:mm:ss
+ //获取当前时间
+ Date date = new Date(System.currentTimeMillis());
+ return simpleDateFormat.format(date) + "";
+
+ }
+}
diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_calorie.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_calorie.xml
new file mode 100644
index 0000000..1001d8d
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_calorie.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_distance.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_distance.xml
new file mode 100644
index 0000000..67a3702
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_distance.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_moon.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_moon.xml
new file mode 100644
index 0000000..b802022
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_moon.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_step.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_step.xml
new file mode 100644
index 0000000..69eb902
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_step.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/android/OldPeopleHome/app/src/main/res/drawable/ic_time.xml b/android/OldPeopleHome/app/src/main/res/drawable/ic_time.xml
new file mode 100644
index 0000000..35e85d9
--- /dev/null
+++ b/android/OldPeopleHome/app/src/main/res/drawable/ic_time.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml
index f202bd3..1f5909f 100644
--- a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml
+++ b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_sleep.xml
@@ -1,12 +1,96 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_step.xml b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_step.xml
index ff0cc1c..288abee 100644
--- a/android/OldPeopleHome/app/src/main/res/layout/fragment_old_step.xml
+++ b/android/OldPeopleHome/app/src/main/res/layout/fragment_old_step.xml
@@ -1,12 +1,364 @@
-
+ android:layout_height="wrap_content">
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/OldPeopleHome/app/src/main/res/values/colors.xml b/android/OldPeopleHome/app/src/main/res/values/colors.xml
index 7a4f366..ded466e 100644
--- a/android/OldPeopleHome/app/src/main/res/values/colors.xml
+++ b/android/OldPeopleHome/app/src/main/res/values/colors.xml
@@ -4,5 +4,11 @@
#303F9F
#FF4081
- #3F51B5
+ #ec8060
+ #e66d4a
+ #3d4eca
+ #d63f9c
+ #5adeb2
+
+ #dfdede
diff --git a/android/图标/卡路里.svg b/android/图标/卡路里.svg
new file mode 100644
index 0000000..2e21989
--- /dev/null
+++ b/android/图标/卡路里.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/android/图标/月亮.svg b/android/图标/月亮.svg
new file mode 100644
index 0000000..e246434
--- /dev/null
+++ b/android/图标/月亮.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/android/图标/距离.svg b/android/图标/距离.svg
new file mode 100644
index 0000000..48fda55
--- /dev/null
+++ b/android/图标/距离.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/android/图标/闹钟.svg b/android/图标/闹钟.svg
new file mode 100644
index 0000000..a542687
--- /dev/null
+++ b/android/图标/闹钟.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/android/图标/鞋子.svg b/android/图标/鞋子.svg
new file mode 100644
index 0000000..780e3fb
--- /dev/null
+++ b/android/图标/鞋子.svg
@@ -0,0 +1 @@
+
\ No newline at end of file