fixed launcher flash issues when power click.

release ICL02Blood_V87_202108171424_release

diff --git a/app/build.gradle b/app/build.gradle
index d6f325c..c9d9f94 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -130,7 +130,6 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.0-alpha05'
 
     implementation 'com.jakewharton.threetenabp:threetenabp:1.2.2'
-
     implementation 'com.github.xuexiangjys:XUI:1.1.7'
 
     implementation files('libs/ICLoger-release.aar')

diff --git a/app/release/ICL02Blood_V85_202108031501_release.apk b/app/release/ICL02Blood_V87_202108171424_release.apk
similarity index 59%
rename from app/release/ICL02Blood_V85_202108031501_release.apk
rename to app/release/ICL02Blood_V87_202108171424_release.apk
index eb27679..4d2bee1 100644 (file)
Binary files a/app/release/ICL02Blood_V85_202108031501_release.apk and b/app/release/ICL02Blood_V87_202108171424_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index ab773f3..111cf69 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":85,"versionName":"202108031501","enabled":true,"outputFile":"ICL02Blood_V85_202108031501_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V85_202108031501_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"202108171424","enabled":true,"outputFile":"ICL02Blood_V87_202108171424_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V87_202108171424_release.apk","properties":{}}]
\ No newline at end of file

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 385ea81..4ff639e 100644 (file)
--- a/app/src/main/java/com/ic/blood/fragment/JustHeartRateFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/JustHeartRateFragment.java
@@ -74,7 +74,6 @@ public class JustHeartRateFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         //判断是哪个，显示一个，还是显示两个数据
-
         bloodBinding = FragmentHeartRateBinding.inflate(inflater, container, false);
         bloodBinding.setIsShowTips(true);
         bloodBinding.setTopTips(getString(R.string.tips_quiet_please));

diff --git a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
index c7132fa..506e7a5 100644 (file)
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -6,7 +6,6 @@ import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
@@ -19,7 +18,6 @@ import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
@@ -27,12 +25,10 @@ import com.ic.blood.R;
 import com.ic.blood.util.IcLog;
 import com.ic.blood.util.SystemUtils;
 import com.ic.blood.widget.CustomDialogStrategy;
-import com.ic.iclooger.ICLogger;
 import com.ic.work.IHeartRateSensorCallback;
 import com.ic.work.IHeartRateSensorService;
 import com.ic.work.domain.HeartRate;
 import com.xuexiang.xui.widget.dialog.DialogLoader;
-import com.xuexiang.xui.widget.dialog.strategy.impl.MaterialDialogStrategy;
 
 import static android.media.AudioManager.FX_FOCUS_NAVIGATION_DOWN;
 
@@ -363,16 +359,12 @@ public class BloodPresenter {
         DialogLoader mDialogLoader = DialogLoader.getInstance().setIDialogStrategy(new CustomDialogStrategy());
         dialog = mDialogLoader.showTipDialog(mActivity, R.mipmap.warn, mContext.getString(R.string.dialog_warn),
                 mContext.getString(R.string.background_wait), mContext.getString(R.string.dialog_confirm),
-                new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        if (dialogInterface != null) {
-                            dialogInterface.dismiss();
-                        }
-                        if (mActivity != null) {
-                            mActivity.onBackPressed();
-                        }
+                (dialogInterface, i) -> {
+                    if (dialogInterface != null) {
+                        dialogInterface.dismiss();
+                    }
+                    if (mActivity != null) {
+                        mActivity.onBackPressed();
                     }
                 });
     }

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 450d93e..3be6189 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,13 +1,11 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="XUITheme.Phone">
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
     </style>
 
     <style name="bloodTextStyle">

diff --git a/app/version_code.properties b/app/version_code.properties
index 7a16bfe..21db9b2 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Aug 03 15:01:49 CST 2021\r
-VERSION_CODE=85\r
+#Tue Aug 17 14:24:11 CST 2021\r
+VERSION_CODE=87\r