修改了UI样式.

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9bba60d..526b4c2 100644 (file)
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -14,7 +14,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9f83622..a757fd3 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Codes/Android/Blood/IcBlood/app/src/main/res/layout/activity_blood.xml" value="0.23505434782608695" />
+        <entry key="..\:/Codes/Android/Blood/IcBlood/app/src/main/res/layout/fragment_all.xml" value="0.23505434782608695" />
+        <entry key="..\:/Codes/Android/Blood/IcBlood/app/src/main/res/layout/fragment_heart_rate_pressure.xml" value="0.23505434782608695" />
+      </map>
+    </option>
+  </component>
   <component name="FindBugsConfigurable">
     <option name="make" value="true" />
     <option name="effort" value="default" />

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644 (file)
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

diff --git a/app/release/ICL02Blood_V102_202112031133_release.apk b/app/release/ICL02Blood_V102_202112031133_release.apk
deleted file mode 100644 (file)
index cae8d27..0000000
Binary files a/app/release/ICL02Blood_V102_202112031133_release.apk and /dev/null differ

diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644 (file)
index b8943f6..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":102,"versionName":"202112031133","enabled":true,"outputFile":"ICL02Blood_V102_202112031133_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V102_202112031133_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/blood/fragment/HeartRateAndBloodPressureFragment.java b/app/src/main/java/com/ic/blood/fragment/HeartRateAndBloodPressureFragment.java
index cd3bbb0..fd411d1 100644 (file)
--- a/app/src/main/java/com/ic/blood/fragment/HeartRateAndBloodPressureFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/HeartRateAndBloodPressureFragment.java
@@ -1,5 +1,7 @@
 package com.ic.blood.fragment;
 
+import static android.content.Context.POWER_SERVICE;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
@@ -29,8 +31,6 @@ import java.lang.ref.WeakReference;
 import pl.droidsonroids.gif.GifDrawable;
 import pl.droidsonroids.gif.GifImageView;
 
-import static android.content.Context.POWER_SERVICE;
-
 /**
  * 这个是只有心率和血氧的UI
  */
@@ -73,7 +73,6 @@ public class HeartRateAndBloodPressureFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         //判断是哪个，显示一个，还是显示两个数据
-        
         bloodBinding = FragmentHeartRatePressureBinding.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/fragment/SelectFragment.java b/app/src/main/java/com/ic/blood/fragment/SelectFragment.java
index 6d54b4f..1b06155 100644 (file)
--- a/app/src/main/java/com/ic/blood/fragment/SelectFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/SelectFragment.java
@@ -65,7 +65,7 @@ public class SelectFragment extends Fragment {
              */
             //默认只支持血氧
             String functionValue = SystemUtils
-                    .getSystemPropertiesString("persist.sys.health.function.list1",
+                    .getSystemPropertiesString("persist.sys.health.list1",
                             "1");
             ICLogger.e("functionValue ==> " + functionValue);
             supportBloodOxygen = true;
@@ -91,7 +91,7 @@ public class SelectFragment extends Fragment {
             if (supportBloodOxygen && !supportBloodPressure) {
                 //只显示血氧
                 ((Gh301Activity) getActivity()).showJustOxygenPage();
-            } else if (supportBloodOxygen && supportBloodPressure) {
+            } else if (supportBloodOxygen) {
                 //现实血氧+血压
                 ((Gh301Activity) getActivity()).showOxygenAndPressurePage();
             }//其他的case待处理
@@ -113,7 +113,7 @@ public class SelectFragment extends Fragment {
             //获取到配置值
             //默认只支持心率
             String functionValue = SystemUtils
-                    .getSystemPropertiesString("persist.sys.health.function.list2",
+                    .getSystemPropertiesString("persist.sys.health.list2",
                             "4");
             ICLogger.e("functionValue ==> " + functionValue);
             supportBloodOxygen = true;
@@ -139,7 +139,7 @@ public class SelectFragment extends Fragment {
             //心率自己，心率+血压，
             if (supportHeartRate && !supportBloodPressure) {
                 ((Gh301Activity) getActivity()).showHeartRatePage();
-            } else if (supportHeartRate && supportBloodPressure) {
+            } else if (supportHeartRate) {
                 ((Gh301Activity) getActivity()).showHeartRateAndPressurePage();
             }
             //其他的case待处理

diff --git a/app/src/main/res/layout/fragment_heart_rate_pressure.xml b/app/src/main/res/layout/fragment_heart_rate_pressure.xml
index c13367b..97a6cf7 100644 (file)
--- a/app/src/main/res/layout/fragment_heart_rate_pressure.xml
+++ b/app/src/main/res/layout/fragment_heart_rate_pressure.xml
@@ -127,7 +127,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_marginStart="20dp"
-            android:layout_marginBottom="50dp">
+            android:layout_marginBottom="66dp"
+            android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
                 android:id="@+id/ic_high_name"
@@ -146,7 +147,7 @@
         <TextView
             style="@style/bloodTextStyle"
             android:layout_gravity="center|bottom"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="20dp"
             android:gravity="center"
             android:text="@{finishTips}"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}" />
@@ -157,7 +158,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_marginEnd="20dp"
-            android:layout_marginBottom="50dp">
+            android:layout_marginBottom="66dp"
+            android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
                 android:id="@+id/ic_low_name"

diff --git a/app/version_code.properties b/app/version_code.properties
index fa666b7..65095e3 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Dec 03 11:33:18 CST 2021\r
-VERSION_CODE=102\r
+#Mon Jun 13 14:51:14 CST 2022\r
+VERSION_CODE=106\r