From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 7 Sep 2021 09:03:44 +0000 (+0800)
Subject: show blod oxygen in blodd page.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=c504d41f4313dc0c5c9c8599ce486e354eac5714;p=IcBlood.git

show blod oxygen in blodd page.
---

diff --git a/app/src/main/java/com/ic/blood/fragment/JustHeartRateFragment.java b/app/src/main/java/com/ic/blood/fragment/JustHeartRateFragment.java
index 4ff639e..2493f3a 100644
--- a/app/src/main/java/com/ic/blood/fragment/JustHeartRateFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/JustHeartRateFragment.java
@@ -1,6 +1,5 @@
 package com.ic.blood.fragment;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
@@ -149,11 +148,10 @@ public class JustHeartRateFragment extends Fragment {
         });
     }
 
-    @SuppressLint("InvalidWakeLockTag")
     private void initWakeLock(Context context) {
         PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
         if (powerManager != null && mWakeLock == null) {
-            mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "BloodWakeLock");
+            mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "ic:BloodWakeLock");
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_heart_rate.xml b/app/src/main/res/layout/fragment_heart_rate.xml
index cc3c81a..3c51914 100644
--- a/app/src/main/res/layout/fragment_heart_rate.xml
+++ b/app/src/main/res/layout/fragment_heart_rate.xml
@@ -79,8 +79,9 @@
             android:id="@+id/ic_heart_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="36dp"
+            android:layout_gravity="left"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="30dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
@@ -102,10 +103,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
-
             android:layout_marginTop="30dp"
-            android:layout_marginRight="20dp"
-            android:visibility="gone">
+            android:layout_marginRight="20dp">
 
             <TextView
                 android:id="@+id/ic_blood_oxygen_name"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file