From: SnickerSun <scy@incartech.cn>
Date: Tue, 6 Jul 2021 08:06:27 +0000 (+0800)
Subject: release V78
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=2dd10fdc312f9e940a9ccbfad4f7d2f4cc339d0e;p=IcBlood.git

release V78
修复失去焦点再恢复，会造成wakelock失效的问题
---

diff --git a/app/release/ICL02Blood_V78_202107061525_release.apk b/app/release/ICL02Blood_V78_202107061525_release.apk
new file mode 100644
index 0000000..6221e2e
Binary files /dev/null and b/app/release/ICL02Blood_V78_202107061525_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index bc069a4..4a637f4 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":77,"versionName":"202106212050","enabled":true,"outputFile":"ICL02Blood_V77_202106212050_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V77_202106212050_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":78,"versionName":"202107061525","enabled":true,"outputFile":"ICL02Blood_V78_202107061525_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V78_202107061525_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
index 2f8f70e..8c66c6f 100644
--- a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
@@ -64,7 +64,7 @@ public class BloodFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mApp = (BloodApp) mContext.getApplicationContext();
-        initWakeLock(mContext);
+
         delayHandler = new DelayExecuteHandler(this);
     }
 
@@ -86,6 +86,7 @@ public class BloodFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
+        initWakeLock(mContext);
         if (mWakeLock != null) {
             mWakeLock.acquire();
         }
@@ -150,7 +151,7 @@ public class BloodFragment extends Fragment {
     @SuppressLint("InvalidWakeLockTag")
     private void initWakeLock(Context context) {
         PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
-        if (powerManager != null) {
+        if (powerManager != null && mWakeLock == null) {
             mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "BloodWakeLock");
         }
     }
diff --git a/app/src/main/java/com/ic/blood/fragment/HeartRateFragment.java b/app/src/main/java/com/ic/blood/fragment/HeartRateFragment.java
index 380b67d..16cab3e 100644
--- a/app/src/main/java/com/ic/blood/fragment/HeartRateFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/HeartRateFragment.java
@@ -67,7 +67,6 @@ public class HeartRateFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mApp = (BloodApp) mContext.getApplicationContext();
-        initWakeLock(mContext);
         delayHandler = new DelayExecuteHandler(this);
     }
 
@@ -87,6 +86,7 @@ public class HeartRateFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
+        initWakeLock(mContext);
         if (mWakeLock != null) {
             mWakeLock.acquire();
         }
@@ -150,7 +150,7 @@ public class HeartRateFragment extends Fragment {
     @SuppressLint("InvalidWakeLockTag")
     private void initWakeLock(Context context) {
         PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
-        if (powerManager != null) {
+        if (powerManager != null && mWakeLock==null) {
             mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "BloodWakeLock");
         }
     }
diff --git a/app/src/main/java/com/ic/blood/fragment/OxygenFragment.java b/app/src/main/java/com/ic/blood/fragment/OxygenFragment.java
index dff8c62..1794e30 100644
--- a/app/src/main/java/com/ic/blood/fragment/OxygenFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/OxygenFragment.java
@@ -67,7 +67,6 @@ public class OxygenFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mApp = (BloodApp) mContext.getApplicationContext();
-        initWakeLock(mContext);
         delayHandler = new DelayExecuteHandler(this);
     }
 
@@ -87,6 +86,7 @@ public class OxygenFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
+        initWakeLock(mContext);
         if (mWakeLock != null) {
             mWakeLock.acquire();
         }
@@ -150,7 +150,7 @@ public class OxygenFragment extends Fragment {
     @SuppressLint("InvalidWakeLockTag")
     private void initWakeLock(Context context) {
         PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
-        if (powerManager != null) {
+        if (powerManager != null && mWakeLock == null) {
             mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "BloodWakeLock");
         }
     }
diff --git a/app/version_code.properties b/app/version_code.properties
index 1157116..d6a2380 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Jun 21 20:50:18 CST 2021
-VERSION_CODE=77
+#Tue Jul 06 15:25:52 CST 2021
+VERSION_CODE=78