release ICLoopPageLauncher_V62_202307021107_release.apk

桌面增加计步显示，修复心率，血样，体温显示

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2c7e034..23a89bb 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="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -15,6 +15,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

diff --git a/app/release/ICLoopPageLauncher_V62_202307021107_release.apk b/app/release/ICLoopPageLauncher_V62_202307021107_release.apk
new file mode 100644 (file)
index 0000000..b202321
Binary files /dev/null and b/app/release/ICLoopPageLauncher_V62_202307021107_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index f9ebd73..9c49bcf 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "versionCode": 1,
       "versionName": "1.0",
-      "outputFile": "ICLoopPageLauncher_V61_202205092053_release.apk"
+      "outputFile": "ICLoopPageLauncher_V62_202307021107_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java
index cfa5199..3b2d044 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java
@@ -370,6 +370,9 @@ public class MainPagePresenter extends BasePresenter {
     private void updateEnvTemp() {
         getValueByKey(KEY_ENV_TEMP);
     }
+    private void updateStepCount() {
+        getValueByKey(KEY_STEP_COUNT);
+    }
 
     private void updateHeartRate() {
         getValueByKey(KEY_HEART_RATE);

diff --git a/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java b/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java
index c0ba1dc..ac848c6 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/StatusBarBasePresenter.java
@@ -83,9 +83,9 @@ public class StatusBarBasePresenter extends BasePresenter {
                 // ICLogger.d("isCharging == > " + isCharging);
                 isChargingValue.postValue(isCharging);
             } else if (Intent.ACTION_POWER_CONNECTED.equals(action)) {
-                showShockAndAudio(0);
+                //showShockAndAudio(0);
             } else if (Intent.ACTION_POWER_DISCONNECTED.equals(action)) {
-                showShockAndAudio(1);
+                //showShockAndAudio(1);
             }
         }
     };

diff --git a/app/src/main/java/com/ic/launcher/utils/Constants.java b/app/src/main/java/com/ic/launcher/utils/Constants.java
index 84676ab..4f806bd 100644 (file)
--- a/app/src/main/java/com/ic/launcher/utils/Constants.java
+++ b/app/src/main/java/com/ic/launcher/utils/Constants.java
@@ -2,7 +2,7 @@ package com.ic.launcher.utils;
 
 public class Constants {
     public static final String PATH = "settings";
-    public static final String AUTHORITY = "com.ic.fzd.settings";
+    public static final String AUTHORITY = "com.ic.protocolSrv.settings";
     public static final String SETTINGS = "content://" + AUTHORITY + "/" + PATH;
     public static final String LAUNCHER_APP_LIST_STYLE = "launcher_app_list_style";
     public static final String BRIGHTNESS_VALUE = "brightness_value";

diff --git a/app/src/main/java/com/ic/launcher/view/MainPageView.java b/app/src/main/java/com/ic/launcher/view/MainPageView.java
index 6b17865..6b607d6 100644 (file)
--- a/app/src/main/java/com/ic/launcher/view/MainPageView.java
+++ b/app/src/main/java/com/ic/launcher/view/MainPageView.java
@@ -19,7 +19,7 @@ public class MainPageView extends LinearLayout {
     private TextView dateView;
     private TextView timeView;
     private TextView weekView;
-    private TextView envTempView;
+    private TextView stepcountView;
     private TextView heartRateView;
     private TextView bloodOxygenView;
     private TextView bodyTempView;
@@ -58,8 +58,8 @@ public class MainPageView extends LinearLayout {
         mainPagerPresenter.bodyTempValue.observeForever(bodyTempValue -> {
             bodyTempView.setText(bodyTempValue);
         });
-        mainPagerPresenter.envTempValue.observeForever(envTempValue -> {
-            envTempView.setText(envTempValue);
+        mainPagerPresenter.stepCountValue.observeForever(stepCountValue -> {
+            stepcountView.setText(stepCountValue);
         });
         mainPagerPresenter.oxygenValue.observeForever(oxygenValue -> {
             bloodOxygenView.setText(oxygenValue);
@@ -73,7 +73,7 @@ public class MainPageView extends LinearLayout {
         dateView = findViewById(R.id.date_tv);
         timeView = findViewById(R.id.time_tv);
         weekView = findViewById(R.id.week_date_tv);
-        envTempView = findViewById(R.id.out_temp_tv);
+        stepcountView = findViewById(R.id.step_count_tv);
         heartRateView = findViewById(R.id.heart_rate_tv);
         bloodOxygenView = findViewById(R.id.blood_oxygen_tv);
         bodyTempView = findViewById(R.id.body_temp_tv);

diff --git a/app/src/main/res/layout/item_main_page.xml b/app/src/main/res/layout/item_main_page.xml
index 598f512..a1319de 100644 (file)
--- a/app/src/main/res/layout/item_main_page.xml
+++ b/app/src/main/res/layout/item_main_page.xml
@@ -60,13 +60,13 @@
             <ImageView
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:src="@mipmap/out_temp" />
+                android:src="@mipmap/icon_pedometer" />
 
             <TextView
-                android:id="@+id/out_temp_tv"
+                android:id="@+id/step_count_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="00.0"
+                android:text="00"
                 android:textColor="@color/white"
                 android:textSize="24sp" />
 

diff --git a/app/version_code.properties b/app/version_code.properties
index 92a7355..4da0fa6 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon May 09 20:53:45 CST 2022
-VERSION_CODE=61
+#Sun Jul 02 11:07:03 CST 2023
+VERSION_CODE=62

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 90995b7..05dc669 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 10 10:21:46 CST 2021
+#Tue Mar 17 17:06:55 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https://downloads.gradle.org/distributions/gradle-6.5-all.zip